Removing METRICS dictionary #54