Slimming down and adding an HTC device match