Simplify the clean logic