Small refactoring (extracting CleanableAdapter outside)