Order Delete Fix - Phase 1