Tidy up some service call.