some template related changes (cleanups)