Refactored remove command to be polling-based