Cleaner nearly there