Cleanup : remove unused server-side templatisation
Fix: fix tests after Nicolas's cleanup in 10d9f56796800e946e60671090427e6307543632