Some more cleanup before deployment