Add metric removal