Removed CM dependencies to allow isolated builds.