Operation service cleanup

Simplification:
- removed unwanted abstractions

Performance
- removed unwanted object creation