Clean up status logic for grants