diff --git a/dnsserver.go b/dnsserver.go
index 5f9af1a..bd60d45 100644
--- a/dnsserver.go
+++ b/dnsserver.go
@@ -22,7 +22,7 @@ type Service struct {
 }
 
 func NewService() (s *Service) {
-	s = &Service{Ttl: -1, Manual: false}
+	s = &Service{Ttl: -1}
 	return
 }
 
diff --git a/docker.go b/docker.go
index fe341d4..33118e0 100644
--- a/docker.go
+++ b/docker.go
@@ -117,9 +117,7 @@ func (d *DockerManager) eventCallback(event *dockerclient.Event, ec chan error,
 	switch event.Status {
 	case "die", "stop", "kill":
 		// Errors can be ignored here because there can be no-op events.
-		if s_err == nil && !s.Manual {
-			d.list.RemoveService(event.Id)
-		}
+		d.list.RemoveService(event.Id)
 	case "start", "restart":
 		service, err := d.getService(event.Id)
 		if err != nil {