- Removed unused functions
- Removed unused lib