remove doMap callback
other cleanups