add a couple of cleanup items