Remove cm dependencies