Cleanup deadcode

remove some #if 0'ed code that's never used.