Cleanups of dead code