cleanup before moving to manifest v2