Trying to implement device removal

Untested yet