removed some template filler