Fix CLI errors on orphan remove command

Also, convert to use polling.