Removed dumb and incorrect validation