Changes to clean method