Remove some redundant 'extra cleaning' in T4850