Clean up FileManager a bit...