Fix cleanup section