Drop unused validation stuff

Fixes EUCA-8569