remove some more unintended code.  For all I know that extra code might even be doing something we should be doing, but until/unless someone wants to verify that its safer to exclude anything not directly related to what I was intending to fix