remove another hardcoding of hostnames