Clean up client code