remove references to old files, and fixed loading problem