Second phase cleanup