[18] Added cleanup