Removing a couple of unneeded things
Fix up and merge in recent changes to ProjectManager