remove jstdg6e and update some templates