remove dependency on protobuf classes from clarity model