couple more cleanup items