Clean up client code.