Remove 2 more apiv2 calls