Revert "Add TODO/FIXME and cleanup handleInputFile"

This reverts commit c16abcfb.
25 jobs for master in 8 minutes and 49 seconds (queued for 113 minutes and 43 seconds)