add dep_type to ev.dependencies
remove cm stuff