Add some more hint-like things to remove