Take out validate (again)