Removing verifications supporting classes

Change-Id: I4ec9956a38f6a5535c34495262de8f0d0344afc4