alterations and clean up for deployment