Dead code removal.
Merge pull request #190 from ahmedcharles/dead

Dead code removal.