Finally removed all file_helper crap?