HAL-342: Remove unused class