added spans clean up to Duo