Cleanup, removed Metrics