[GSF] Some more code cleanup, also removed a few files that were unneeded.
[GSF] Somehow these were not committed earlier.