Rip out unnecessary logic from ResourceLoader
0.6.0