Clean up some client code.