Removed Haystack reference