benchmark: cleaning up menu handling