diff --git a/cmd/env_factory.go b/cmd/env_factory.go
index 5b143e38d..29d4f1a1e 100644
--- a/cmd/env_factory.go
+++ b/cmd/env_factory.go
@@ -138,7 +138,7 @@ func NewEnvFactory(
 
 		f.stemcellManagerFactory = bistemcell.NewManagerFactory(stemcellRepo)
 		f.vmManagerFactory = bivm.NewManagerFactory(
-			vmRepo, stemcellRepo, diskDeployer, deps.UUIDGen, deps.FS, deps.Logger)
+			vmRepo, diskDeployer, deps.UUIDGen, deps.FS, deps.Logger)
 
 		deploymentRepo := biconfig.NewDeploymentRepo(f.deploymentStateService)
 		releaseRepo := biconfig.NewReleaseRepo(f.deploymentStateService, deps.UUIDGen)
diff --git a/deployment/vm/manager.go b/deployment/vm/manager.go
index 88c1d7263..e49ab1fa2 100644
--- a/deployment/vm/manager.go
+++ b/deployment/vm/manager.go
@@ -28,7 +28,6 @@ type Manager interface {
 
 type manager struct {
 	vmRepo        biconfig.VMRepo
-	stemcellRepo  biconfig.StemcellRepo
 	diskDeployer  DiskDeployer
 	agentClient   biagentclient.AgentClient
 	cloud         bicloud.Cloud
@@ -41,7 +40,6 @@ type manager struct {
 
 func NewManager(
 	vmRepo biconfig.VMRepo,
-	stemcellRepo biconfig.StemcellRepo,
 	diskDeployer DiskDeployer,
 	agentClient biagentclient.AgentClient,
 	cloud bicloud.Cloud,
@@ -54,7 +52,6 @@ func NewManager(
 		cloud:         cloud,
 		agentClient:   agentClient,
 		vmRepo:        vmRepo,
-		stemcellRepo:  stemcellRepo,
 		diskDeployer:  diskDeployer,
 		uuidGenerator: uuidGenerator,
 		fs:            fs,
@@ -77,7 +74,6 @@ func (m *manager) FindCurrent() (VM, bool, error) {
 	vm := NewVM(
 		vmCID,
 		m.vmRepo,
-		m.stemcellRepo,
 		m.diskDeployer,
 		m.agentClient,
 		m.cloud,
@@ -149,7 +145,6 @@ func (m *manager) Create(stemcell bistemcell.CloudStemcell, deploymentManifest b
 	vm := NewVMWithMetadata(
 		cid,
 		m.vmRepo,
-		m.stemcellRepo,
 		m.diskDeployer,
 		m.agentClient,
 		m.cloud,
diff --git a/deployment/vm/manager_factory.go b/deployment/vm/manager_factory.go
index 432a23ba3..788379cd8 100644
--- a/deployment/vm/manager_factory.go
+++ b/deployment/vm/manager_factory.go
@@ -19,7 +19,6 @@ type ManagerFactory interface {
 
 type managerFactory struct {
 	vmRepo        biconfig.VMRepo
-	stemcellRepo  biconfig.StemcellRepo
 	diskDeployer  DiskDeployer
 	uuidGenerator boshuuid.Generator
 	fs            boshsys.FileSystem
@@ -28,7 +27,6 @@ type managerFactory struct {
 
 func NewManagerFactory(
 	vmRepo biconfig.VMRepo,
-	stemcellRepo biconfig.StemcellRepo,
 	diskDeployer DiskDeployer,
 	uuidGenerator boshuuid.Generator,
 	fs boshsys.FileSystem,
@@ -36,7 +34,6 @@ func NewManagerFactory(
 ) ManagerFactory {
 	return &managerFactory{
 		vmRepo:        vmRepo,
-		stemcellRepo:  stemcellRepo,
 		diskDeployer:  diskDeployer,
 		uuidGenerator: uuidGenerator,
 		fs:            fs,
@@ -47,7 +44,6 @@ func NewManagerFactory(
 func (f *managerFactory) NewManager(cloud bicloud.Cloud, agentClient biagentclient.AgentClient) Manager {
 	return NewManager(
 		f.vmRepo,
-		f.stemcellRepo,
 		f.diskDeployer,
 		agentClient,
 		cloud,
diff --git a/deployment/vm/manager_test.go b/deployment/vm/manager_test.go
index 3f37e5c63..5dee55b5b 100644
--- a/deployment/vm/manager_test.go
+++ b/deployment/vm/manager_test.go
@@ -60,7 +60,6 @@ var _ = Describe("Manager", func() {
 
 		manager = NewManager(
 			fakeVMRepo,
-			stemcellRepo,
 			fakeDiskDeployer,
 			fakeAgentClient,
 			fakeCloud,
@@ -130,7 +129,6 @@ var _ = Describe("Manager", func() {
 			expectedVM := NewVMWithMetadata(
 				"fake-vm-cid",
 				fakeVMRepo,
-				stemcellRepo,
 				fakeDiskDeployer,
 				fakeAgentClient,
 				fakeCloud,
diff --git a/deployment/vm/vm.go b/deployment/vm/vm.go
index bdd3f0ba2..281e388c6 100644
--- a/deployment/vm/vm.go
+++ b/deployment/vm/vm.go
@@ -53,7 +53,6 @@ type VM interface {
 type vm struct {
 	cid          string
 	vmRepo       biconfig.VMRepo
-	stemcellRepo biconfig.StemcellRepo
 	diskDeployer DiskDeployer
 	agentClient  biagentclient.AgentClient
 	cloud        bicloud.Cloud
@@ -67,7 +66,6 @@ type vm struct {
 func NewVM(
 	cid string,
 	vmRepo biconfig.VMRepo,
-	stemcellRepo biconfig.StemcellRepo,
 	diskDeployer DiskDeployer,
 	agentClient biagentclient.AgentClient,
 	cloud bicloud.Cloud,
@@ -78,7 +76,6 @@ func NewVM(
 	return &vm{
 		cid:          cid,
 		vmRepo:       vmRepo,
-		stemcellRepo: stemcellRepo,
 		diskDeployer: diskDeployer,
 		agentClient:  agentClient,
 		cloud:        cloud,
@@ -92,7 +89,6 @@ func NewVM(
 func NewVMWithMetadata(
 	cid string,
 	vmRepo biconfig.VMRepo,
-	stemcellRepo biconfig.StemcellRepo,
 	diskDeployer DiskDeployer,
 	agentClient biagentclient.AgentClient,
 	cloud bicloud.Cloud,
@@ -104,7 +100,6 @@ func NewVMWithMetadata(
 	return &vm{
 		cid:          cid,
 		vmRepo:       vmRepo,
-		stemcellRepo: stemcellRepo,
 		diskDeployer: diskDeployer,
 		agentClient:  agentClient,
 		cloud:        cloud,
@@ -302,11 +297,6 @@ func (vm *vm) Delete() error {
 		return bosherr.WrapError(err, "Deleting vm from vm repo")
 	}
 
-	err = vm.stemcellRepo.ClearCurrent()
-	if err != nil {
-		return bosherr.WrapError(err, "Clearing current stemcell from stemcell repo")
-	}
-
 	// returns bicloud.Error only if it is a VMNotFoundError
 	return deleteErr
 }
diff --git a/deployment/vm/vm_test.go b/deployment/vm/vm_test.go
index 0bccad59c..22e42cadb 100644
--- a/deployment/vm/vm_test.go
+++ b/deployment/vm/vm_test.go
@@ -29,7 +29,6 @@ var _ = Describe("VM", func() {
 	var (
 		vm               VM
 		fakeVMRepo       *configfakes.FakeVMRepo
-		fakeStemcellRepo *configfakes.FakeStemcellRepo
 		fakeDiskDeployer *vmfakes.FakeDiskDeployer
 		fakeAgentClient  *fakebiagentclient.FakeAgentClient
 		fakeCloud        *cloudfakes.FakeCloud
@@ -61,12 +60,10 @@ var _ = Describe("VM", func() {
 		fs = fakesys.NewFakeFileSystem()
 		fakeCloud = &cloudfakes.FakeCloud{}
 		fakeVMRepo = &configfakes.FakeVMRepo{}
-		fakeStemcellRepo = &configfakes.FakeStemcellRepo{}
 		fakeDiskDeployer = &vmfakes.FakeDiskDeployer{}
 		vm = NewVM(
 			"fake-vm-cid",
 			fakeVMRepo,
-			fakeStemcellRepo,
 			fakeDiskDeployer,
 			fakeAgentClient,
 			fakeCloud,
@@ -285,7 +282,6 @@ var _ = Describe("VM", func() {
 			vm = NewVMWithMetadata(
 				"fake-vm-cid",
 				fakeVMRepo,
-				fakeStemcellRepo,
 				fakeDiskDeployer,
 				fakeAgentClient,
 				fakeCloud,
@@ -588,12 +584,6 @@ var _ = Describe("VM", func() {
 			Expect(fakeVMRepo.ClearCurrentCallCount()).To(Equal(1))
 		})
 
-		It("clears current stemcell in the stemcell repo", func() {
-			err := vm.Delete()
-			Expect(err).ToNot(HaveOccurred())
-			Expect(fakeVMRepo.ClearCurrentCallCount()).To(Equal(1))
-		})
-
 		Context("when deleting vm in the cloud fails", func() {
 			BeforeEach(func() {
 				fakeCloud.DeleteVMReturns(errors.New("fake-delete-vm-error"))
@@ -629,13 +619,6 @@ var _ = Describe("VM", func() {
 				Expect(err).To(Equal(deleteErr))
 				Expect(fakeVMRepo.ClearCurrentCallCount()).To(Equal(1))
 			})
-
-			It("clears current stemcell in the stemcell repo", func() {
-				err := vm.Delete()
-				Expect(err).To(HaveOccurred())
-				Expect(err).To(Equal(deleteErr))
-				Expect(fakeVMRepo.ClearCurrentCallCount()).To(Equal(1))
-			})
 		})
 	})