refactor how factories clean up after themselves
make specs more obvious