Clean up on settings
Fixing bug with new haystack