remove g
merge in master