Dead code elimination.
Merge branch 'master' of github.com:sos22/dissertation
Fix up the last little fiddly formatting errors.  I think this is
ready to go in.