Pass two of cleanup