Update build system to remove cmi
Merge branch 'feature-remove-cmi-dep'