commented out and/or removed a lot of main-vars.

- things that were commented out may be in use/necessary elsewhere
  but I haven't noticed. Remove the commented stuff within the next
  few commits if there are no noticeable side-effects.

Signed-off-by: William Rockwood <wrockwood@tadl.org>