Further cleanup FileLoader

23 jobs for master in 24 minutes and 37 seconds (queued for 35 minutes and 31 seconds)