Added cleanup settings