removed unneeded templates