Cleanup FileSystemUtils

This PR cleans up a lot of scary methods in FileSystemUtils.