Removing old table API calls, improving map performance