removing more unneeded templates