Removing old RPC code and replacing it with Thrift code.