Remove dead code and interceptor. Tweak template.