Refactored: Util class
- Removed unused methods