remove further intelligence from endpoint setup (test fix for resurfacing of issue #2).