cleaned up the way that metrics are dropped