Remove unnecessary bit of CM code from other commit