Adding the missing cleaner