Cleanups, removing of duplicate files, add of some GFA sources.