Adding cleanup to avoid cross gateway carry over