CLEARWATER: CP-4431: Remove vmpr