Removed some template elements