This is a good idea since we also have remove devices