remove hardcoded htc stuff