removing v2 specific logic