Adding the deploy user and lots of cleaning up.