removed more template gunk