- Removed unused code
- Fix code