Lots of cleanup before pushing live