major cleanups already accomplished as I make the switchover. still more to go