remove haystack dependency