Removed unneeded directives, joined templates