remove some unused parts