Add API to remove device