Removed some template hackery