Removed deferred validation