Code cleanup.  Christ, what was I thinking?