Remove dead code that depends on protobuf support. Change-Id: I9dc948f25f492af6d8de7987a32ba7afc20b81da