diff --git a/job.go b/job.go
index 95804e1..0a32dc1 100644
--- a/job.go
+++ b/job.go
@@ -1723,7 +1723,7 @@ func jobGWithdraw(j Job) {
 			case cacheObjSubType[`msg_withdraw_req`]:
 				log.Printf("jobGWithdraw[%d] : Handling withdraw req.\n", j.ID64)
 				if false /* check if it's ours */ {
-					p.CleanupMsg = append(p.CleanupMsg, m)
+					//p.CleanupMsg = append(p.CleanupMsg, m)
 					err = setJobPayloadJSON(j.ID64, p)
 				} else {
 					err = rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC())
@@ -1734,7 +1734,7 @@ func jobGWithdraw(j Job) {
 			case cacheObjSubType[`msg_withdraw_code`]:
 				log.Printf("jobGWithdraw[%d] : Handling withdraw code.\n", j.ID64)
 				if false /* check if it's ours */ {
-					p.CleanupMsg = append(p.CleanupMsg, m)
+					//p.CleanupMsg = append(p.CleanupMsg, m)
 					err = setJobPayloadJSON(j.ID64, p)
 				} else {
 					err = rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC())
@@ -1769,7 +1769,7 @@ func jobGWithdraw(j Job) {
 			}
 
 			if !c.CWIdle {
-				d := c.CWBusyUntil - time.Now().UTC()
+				d := c.CWBusyUntil.Sub(time.Now().UTC())
 				cmd := TGCommand{
 					Type:         commandReplyMsg,
 					Text:         fmt.Sprintf("Busy for %s. Withdrawal queued.", d.String()),