Now supports validations again

Also deletes some files that are no longer used.