Remove redundant template boilerplate 2