cleaning up client side API