Clean up code for Order Service story