[delivers #62492052 #62501512]

Overall cleanup of all GTS code (removing unused code) and also GTS now
removes from empty when adding to active and partially vice-versa