Merge "Clean up hint usage" into main