Minor fixes.  Removed unused file.