Cleaned up unused imports and commented lines.