Removed haystack support.
Converted spaces to tabs.