remove some unnecssary protobuf declarations, work around for builtin type params