Revert "Add support for CL"

This reverts commit 30d8627c3f1ce8eaed9ad62cb4258df1e4a8f921.