Some minor house cleaning commits