Dead code removal.

I'm not removing actual code in this change.