Remove dead code.
Patch clang break (requires gcc 4.8)
Merge pull request #144 from evoskuil/version2

Patch clang break, remove dead code.