Remove more CM specific stuff