Comment out CM code