remove old templates
first commit of branch
more comments