added some cleanup items