Unless we still have a good reason to keep them I'm unaware of, the unfulfilled CL class stubs should be removed.