Remove haystack dependencies