code cleanup for service mgmt