removing dependencies; active_merchant, manual_order_upgrade