Tidy up previous change. Remove dead code.