more template clean up