more cleanup, tests should pass now