removing junk
some further changes that have gotten me nowhere