Cleaned up unused imports and other warnings.