Cleaning up service specifics