Tidies up some leftover code.