Cdec source feature cleanup (untested).