Clean up deploy.rb a bit more