[SP] Remove some unused client code.