Can we now remove the ?gv macro too ?