401 Remove CleverDataset from helpers