Improvements to metricsNnulls

Deleted cluster-specific functions, and added “cluster” argument to
metricsNnulls.