Added cleaning option