Also rewrite the entire function to be faster and drop the AVX version which is no longer useful.