Removed checks for v2