Added TODO items
Simplification step 1
Cleanup
Service simplification
Added a TODO item
Simplification
OMW