Refactoring, some of which may be silly.  Many deleting.