Completing new children order management and some cleanup