more mirroring cleanup