adding htc vendor / cleaning up