diff --git a/x/registry/keeper/record_keeper.go b/x/registry/keeper/record_keeper.go
index c80a7e34..db5d71c9 100644
--- a/x/registry/keeper/record_keeper.go
+++ b/x/registry/keeper/record_keeper.go
@@ -114,11 +114,8 @@ func (rk RecordKeeper) OnAuctionWinnerSelected(ctx sdk.Context, auctionId string
 
 			logger(ctx).Info(fmt.Sprintf("Deleting the expiry queue entry: %s", name))
 			if err = rk.k.deleteAuthorityExpiryQueue(ctx, name, authority); err != nil {
-				panic(err)
+				logger(ctx).Error("Unable to delete expiry queue entry", err)
 			}
-
-			// TODO: Set expiry time in authority as the auction's reveals end time
-			// authority.ExpiryTime = auctionObj.RevealsEndTime
 		}
 
 		// Forget about this auction now, we no longer need it.