remove some unused imports/variables