=htc small cleanup