I'm thinking keep HTC everything. Most of their stuff doesn't actually run unless you tell it to. I suppose since I'm not blind, I could just take out the items from your code that I don't want deleted since I'll probably be mulling it over until I push the button.
