[delivers #62030154]

worked on singling out some of the gts problems we need to fix and
started removing unnecessary functions and code