[REF] Grant cleanup