Removal reporting fixes