GLDEFs cleanup