remove some template over-engineering