CF #38 - Remove non generic functions