Second pass cleanup