remove redundant stuff