[GSF] Minor changes.
[SNSF] Massive code cleanup, as well as removing as much unused code/variables as possible.