clean up dataByAction()