Revert "Revert "Finished order delete""

This reverts commit 2ae6898779f3212cde300ad6a77e9b2f72e61e34.
bring back order delete changes