Remove WP code introduced by HTC