Redeploying/cleaning up some things