Cleaned up script.  Removed unused cruft.