[Blue-HD] cleanup