Clean up client side code