Clean up build refactor

Minimize master divergence.