[PATCH 00/30] Remove CNL support