Added work on removal.