Rework structure of metrics, cornfield to use an init
Remove debugging artifacts