Remove cm and add Oct dependencies.