more cleanup in preparation for deployment