remove redundant /unused stuff