Clean up for production push; refactor of simultaneous spawn in progress