removed templates
fixed verification bug