Jeremy Newman : remove template, merge into plugin