Adapt the new renderer and remove the depracted controls