Merge "Clean up de hidl flagged code" into main