Trivial clean up of unused, and broken, rpc code from migration.

Change-Id: I6ea80ab724371462264eabce860c507401611232