Do a better job stripping project metadata [IMMUTANT-434]