More cleanups of dead code