clean up client, remove useless util