removed more funcgen dep