Merge pull request #175 from raphinesse/remove-unused-stuff

Remove unused stuff