Removed more dead code.