Remove dependency to haystack