Clean up logic. Next step is to allow parallel execution for deploy