Cleanup of the OrderService

Untested and possibly more or less corrected.