More dead code removal and project file fixup.