callset: cleanup old functions, change some naming