Merge pull request #1831 from rubenk/ai_hints-cleanup