Removed CFG-deprecated stuff.