Clean up deployment refactor

Minimize divergence from master.