Clean out cruft that was put in there while working on #15.  Passes tests on 7.6