Remove orderLogic