Merge "Remove inactive devices"