Add tasks to remove deprecated API calls to TODO