adjust some templates
remove some stuff