Merge pull request #7072 from SvenDowideit/remove-infrastructure-dir

this info is out of date and forgotten