Remove more dead code.
Build on MSVC 2005.