removed templates and comments