More visualization cleanup