clean up some. still TODO unit test failure on initial run