remove for new template