Removed CM dependencies
Changes for omni build system