diff --git a/src/crypto/CryptoNight_x86.h b/src/crypto/CryptoNight_x86.h
index 43b815e7..502d6e3b 100644
--- a/src/crypto/CryptoNight_x86.h
+++ b/src/crypto/CryptoNight_x86.h
@@ -6,6 +6,7 @@
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018      aegroto     <https://github.com/aegroto>
  * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -37,7 +38,6 @@
 #include "crypto/CryptoNight.h"
 #include "crypto/CryptoNight_constants.h"
 #include "crypto/CryptoNight_monero.h"
-#include "crypto/CryptoNight_x86_loop.h"
 #include "crypto/soft_aes.h"
 
 
@@ -417,37 +417,45 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si
     __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
 
     uint64_t idx0 = h0[0] ^ h0[4];
-    void* memoryPointer = ((uint8_t*) l0) + ((idx0) & MASK);
+    void* mp = ((uint8_t*) l0) + ((idx0) & MASK);
+  
+    for (size_t i = 0; i < ITERATIONS; i++) {
+        __m128i cx;
 
-    if(SOFT_AES && ALGO == xmrig::CRYPTONIGHT_HEAVY) {
-        for (size_t i = 0; i < ITERATIONS; i++) {
-            __m128i cx;
-            SINGLEHASH_LOOP_SOFTAES
-            SINGLEHASH_LOOP_COMMON
-            SINGLEHASH_LOOP_CNHEAVY
+        if (SOFT_AES) {
+            cx = soft_aesenc((uint32_t*) mp, _mm_set_epi64x(ah0, al0)); 
+        } else {  
+            cx = _mm_load_si128((__m128i *) mp);
+            cx = _mm_aesenc_si128(cx, _mm_set_epi64x(ah0, al0));
         }
-    } else if(!SOFT_AES && ALGO == xmrig::CRYPTONIGHT_HEAVY) {
-        for (size_t i = 0; i < ITERATIONS; i++) {
-            __m128i cx;
-            SINGLEHASH_LOOP_HARDAES
-            SINGLEHASH_LOOP_COMMON
-            SINGLEHASH_LOOP_CNHEAVY
-        }
-    } else {
-        for (size_t i = 0; i < ITERATIONS; i++) {
-            __m128i cx;
 
-            if (SOFT_AES) {
-                SINGLEHASH_LOOP_SOFTAES
-            } else {  
-                SINGLEHASH_LOOP_HARDAES
-            }
+        _mm_store_si128((__m128i *) mp, _mm_xor_si128(bx0, cx));
+        VARIANT1_1(mp);        
+        mp = ((uint8_t*) l0) + ((idx0 = EXTRACT64(cx)) & MASK);        
+        bx0 = cx;
 
-            SINGLEHASH_LOOP_COMMON
+        uint64_t hi, lo, cl, ch;
+        cl = ((uint64_t*) mp)[0];
+        ch = ((uint64_t*) mp)[1];
+        lo = __umul128(idx0, cl, &hi);
 
-            if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
-                SINGLEHASH_LOOP_CNHEAVY
-            }
+        al0 += hi;
+        ah0 += lo;
+
+        VARIANT1_2(ah0, 0);
+        ((uint64_t*) mp)[0] = al0;
+        ((uint64_t*) mp)[1] = ah0;
+        VARIANT1_2(ah0, 0);
+
+        ah0 ^= ch;
+        al0 ^= cl;
+        mp = ((uint8_t*) l0) + ((al0) & MASK); 
+
+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            int64_t n  = ((int64_t*)mp)[0];
+            int32_t d  = ((int32_t*)mp)[2];
+            int64_t q = n / (d | 0x5);
+            ((int64_t*) mp)[0] = n ^ q; 
         }
     }
 
diff --git a/src/crypto/CryptoNight_x86_loop.h b/src/crypto/CryptoNight_x86_loop.h
deleted file mode 100644
index fc44a145..00000000
--- a/src/crypto/CryptoNight_x86_loop.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2018      aegroto
- * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __CRYPTONIGHT_X86_LOOP_H__
-#define __CRYPTONIGHT_X86_LOOP_H__
-
-#define SINGLEHASH_LOOP_COMMON \
-    _mm_store_si128((__m128i *) memoryPointer, _mm_xor_si128(bx0, cx)); \
-    VARIANT1_1(memoryPointer); \
-    idx0 = EXTRACT64(cx); \
-    memoryPointer = ((uint8_t*) l0) + ((idx0) & MASK); \
-    bx0 = cx; \
-    uint64_t hi, lo, cl, ch; \
-    cl = ((uint64_t*) memoryPointer)[0]; \
-    ch = ((uint64_t*) memoryPointer)[1]; \
-    lo = __umul128(idx0, cl, &hi); \
-    al0 += hi; \
-    ah0 += lo; \
-    VARIANT1_2(ah0, 0); \
-    ((uint64_t*) memoryPointer)[0] = al0; \
-    ((uint64_t*) memoryPointer)[1] = ah0; \
-    VARIANT1_2(ah0, 0); \
-    ah0 ^= ch; \
-    al0 ^= cl; \
-    memoryPointer = ((uint8_t*) l0) + ((al0) & MASK); 
-
-#define SINGLEHASH_LOOP_CNHEAVY \
-    int64_t n  = ((int64_t*)memoryPointer)[0]; \
-    int32_t d  = ((int32_t*)memoryPointer)[2]; \
-    int64_t q = n / (d | 0x5); \
-    ((int64_t*) memoryPointer)[0] = n ^ q; 
-
-#define SINGLEHASH_LOOP_SOFTAES \
-    cx = soft_aesenc((uint32_t*) memoryPointer, _mm_set_epi64x(ah0, al0)); 
-
-#define SINGLEHASH_LOOP_HARDAES \
-    cx = _mm_load_si128((__m128i *) memoryPointer); \
-    cx = _mm_aesenc_si128(cx, _mm_set_epi64x(ah0, al0));
-
-#endif /* __CRYPTONIGHT_X86_LOOP_H__ */
\ No newline at end of file