Remove deprecation warnings for templates and use of concat::setup