More cleanup: client -> service