update templates
rm unused stuff