cleanup and adding the removal of old order.