removed cm dependancies