cleaning up client management