Re: [COMMIT] Integrate CL code better into core, remove obsolete compatibility code.