chisel cleanups