Merge "Add clean up code into a flag" into main