Fix errors + rm cm directory