Remove CM Hardware class for now