Remove explicit roll over condition check