Finished removing wrap-around