Cleaned up unused imports and removed autogentext