- Removed unused libs
- Optimized