Removing 'update order' related code from master, continue this work on a branch