Added cleanup hack