Added latest protobuf implementation, cleaned up unused/unneeded code