More changes to set cleanup required value