More GR cleanup