Mark things as removed. There is another bug in there somewhere, but this should stop it