diff --git a/pkg/workceptor/controlsvc.go b/pkg/workceptor/controlsvc.go
index 0d098f98c..6b5e8c6e6 100644
--- a/pkg/workceptor/controlsvc.go
+++ b/pkg/workceptor/controlsvc.go
@@ -351,15 +351,6 @@ func (c *workceptorCommand) ControlFunc(ctx context.Context, nc controlsvc.Netce
 		if err != nil {
 			return nil, err
 		}
-		if c.w.recentlyReleasedUnits[unitid] != "" {
-			c.w.nc.GetLogger().Debug("status called on recently released work unit")
-			cfr := make(map[string]interface{})
-			cfr["State"] = 3
-			cfr["Detail"] = "status called on recently released work unit"
-			cfr["StateName"] = "Failed"
-
-			return cfr, nil
-		}
 		cfr, err := c.w.unitStatusForCFR(unitid)
 		if err != nil {
 			return nil, err
diff --git a/pkg/workceptor/remote_work.go b/pkg/workceptor/remote_work.go
index d4060fd05..bf69680d5 100644
--- a/pkg/workceptor/remote_work.go
+++ b/pkg/workceptor/remote_work.go
@@ -328,7 +328,7 @@ func (rw *remoteUnit) monitorRemoteStatus(mw *utils.JobContext, forRelease bool)
 		}
 		if status[:5] == "ERROR" {
 			if strings.Contains(status, "unknown work unit") {
-				if forRelease || red.LocalReleased {
+				if !forRelease {
 					rw.GetWorkceptor().nc.GetLogger().Debug("Work unit %s on node %s is gone.\n", remoteUnitID, remoteNode)
 					rw.UpdateFullStatus(func(status *StatusFileData) {
 						status.State = WorkStateFailed
diff --git a/pkg/workceptor/workceptor.go b/pkg/workceptor/workceptor.go
index bdcba659d..199867466 100644
--- a/pkg/workceptor/workceptor.go
+++ b/pkg/workceptor/workceptor.go
@@ -58,7 +58,6 @@ type Workceptor struct {
 	workTypes         map[string]*workType
 	activeUnitsLock   *sync.RWMutex
 	activeUnits       map[string]WorkUnit
-	recentlyReleasedUnits       map[string]string
 	SigningKey        string
 	SigningExpiration time.Duration
 	VerifyingKey      string
@@ -86,7 +85,6 @@ func New(ctx context.Context, nc NetceptorForWorkceptor, dataDir string) (*Workc
 		workTypes:         make(map[string]*workType),
 		activeUnitsLock:   &sync.RWMutex{},
 		activeUnits:       make(map[string]WorkUnit),
-		recentlyReleasedUnits:       make(map[string]string),
 		SigningKey:        "",
 		SigningExpiration: 5 * time.Minute,
 		VerifyingKey:      "",
diff --git a/pkg/workceptor/workunitbase.go b/pkg/workceptor/workunitbase.go
index ac17931f9..0e9a17da2 100644
--- a/pkg/workceptor/workunitbase.go
+++ b/pkg/workceptor/workunitbase.go
@@ -531,13 +531,6 @@ func (bwu *BaseWorkUnit) Release(force bool) error {
 	defer bwu.w.activeUnitsLock.Unlock()
 	delete(bwu.w.activeUnits, bwu.unitID)
 
-	bwu.w.recentlyReleasedUnits[bwu.unitID] = bwu.unitID
-
-	// go func()  {
-	// 	time.Sleep(time.Second * 10)
-	// 	delete(bwu.w.recentlyReleasedUnits, bwu.unitID) 
-	// }()
-
 	return nil
 }