more cleanup, spec tests pass