remove some unsed stuff