Fix to allow requiring only some files
Remove old unneeded file