Dead code removal.
Fixed formating, no functional changes.