cleaning up client apis