Small changes.  Removing some now unncessary code.  Minor Makefile edits.