Removed senseless code for default_file handlng