Dead code, again, etc.