Removed the old validator (it was crap)