[RT17143] First go at date1 cleanup settings