WIP removing external synthesized GDEF support and implementing it internally