Cleaned up editMetrics and deleteDatum a bit