finish g2-ization - remove lots of dead code