Removed problematic eviction code