Removed more "cl" classifier remnants