Improve device removal