Added cleanup bypass