Cleanup and add benchmark count