cleaned up client