Remove threading/CD ifdefs