Remove out-of-bounds logic