Remove cm dependencies and makefile