Remove client code, now in its own tree

Change-Id: Id476b2f8e04babf46359cf219d350ac36b1b7d98