Massive cleanup.  Trying to do way too much here. KISS.