service cleanup
preliminary service locator support