Order Service API Update and cleaning up file overrides