a few more cleanup items