Remove legacy code around CDF modules