remove some unused stuff