Fix the cleaning mapping