Some more post deployment cleanup