More cleanup of mirroring.