Cleanup/re-specify validations