Removed unused classes
Added Location cache