Remove cm kernel dependency, fixed error