removing some unused imports and other things