Removing some unused imports and other warnings