more cleanup work.
...
...
..
...need to be able to test this stuff..