Remove old system create orchestration code