Updated for polling-based remove command