remove redundant cleanup