4rd cleanup pass