Remove some unnecessary objects around metrics handling for simplicity.
Merge pull request #1045 from guardian/switches

Remove some unnecessary objects around metrics handling for simplicity.