Removed metrics so that we can branch that for later. And this should be the last push from the sick laptop of death.