remove extra hacks, compiler will optimize this

no need to be this smart, remove extra code, compiler does
loop unrolling