do some iterator / writer api cleanup