Add cleaning and wiping