Cleanup
Merge pull request #6 from christianvozar/fix/metric-cleanup

Cleanup