Cleanup domain model for order