removed some template code