- remove some unused stuff