remove some unused code and stuff