Code cleanup: remove some unhelpful typedefs
Remove template.cpp