More refactoring in ReleaseCleaning