remove NO_AUTOLOAD constant which is not needed now
Refactor validators
Fix specs