Hints cleanup