Cleaned up links and used persistent storage.