Refactoring of template data.
Cleanup after refactor.