Removed dead code.  Removed unneeded #include directives.