Removal of references to old modules