More dead code removed.