branch build-20210612FG deleted, no more testing about that; cleanups & tune Makefiles, too.