2nd pass cleanup