Cleanup
Info/lookup cleanup; mvar info in viewer