Task 16188 cleaning