Remove unused function, unnecessary spacing
Make filename searching more robust, remove unneeded options