More dead code cleanup.