Removed info caching
Removed unused methods