Add earlier fix that commented out code for removal of orders (LEV-48)