No template

Doesn't make sense to keep both branches considering the incoming changes (core refactor / c++11 migration)