Tidied up some junk code from a few files.