gsf: cleanups.