Cleaning up more leftovers from CM