environments: removing old stubs, cleaning up new environments