Code cleanup.

Changed old menu action names to match GUI strings. Removed a piece of
forgotten debug code.