Add the reset of the templates and TODO statements
Remove duplicate outputs