Minor code cleanup - removed cached validator vars

Change-Id: Id12cc610ff09923e4d9b1c3aec5c7c101aaad05e
Merge "Minor code cleanup - removed cached validator vars"