Merge the GO changes dfighter2->Master part 14

Removed some unused code.