file_system : more cleanup