Some minor house cleaning.