Remove references to g