Merge pull request #42 from jimsch/master

Kill unused #ifdefs