[TASK] Cleanup
[TASK] Add $parent property to AbstractService