Rework device changes and removal, it works