removed haystack support