Remove old results infrastructure

And adjust metrics