cleaned up client nimoy