removed unneeded templates (already in factory)