Import cleanup + MANIFEST