Refactor validate method

Dupe checking fixed when no validate field defined