Dead code, again, etc.
Merge pull request #704 from arnaudbey/master

Dead code, again, etc.