- add missing UtilityService stub
- cleanup