remove  haystack dependency. Do not merge