WIP checkpoint of gtype removal
remove gtype usage