a couple of cleanup items