More v1 cleanup.