Dead code removal.
Tidyup.