review rpc_cleanup.diff for tmroeder