Remove length check