We don't use underscore anymore, so remove it.