Removed verification stuff