#65: clean up the service