Added the ability to remove devices