Dead code
Some changes