Removing unused code in Device Manager