Strip out unnneeded components of the v1 common files