Mirror removal has been Accepted
Update with Nick's changes