FIX: only files which didn't exist could be unloaded. Oops...
CLEAN: Removed some debug code