diff --git a/js/dist/carousel.js b/js/dist/carousel.js
index f382a641e..8b6119a07 100644
--- a/js/dist/carousel.js
+++ b/js/dist/carousel.js
@@ -335,11 +335,9 @@ var Carousel = function ($) {
         $(nextElement).addClass(directionalClassName);
 
         $(activeElement).one(Util.TRANSITION_END, function () {
-          $(nextElement).removeClass(directionalClassName).removeClass(direction);
+          $(nextElement).removeClass(directionalClassName + ' ' + direction).addClass(ClassName.ACTIVE);
 
-          $(nextElement).addClass(ClassName.ACTIVE);
-
-          $(activeElement).removeClass(ClassName.ACTIVE).removeClass(direction).removeClass(directionalClassName);
+          $(activeElement).removeClass(ClassName.ACTIVE + ' ' + direction + ' ' + directionalClassName);
 
           _this3._isSliding = false;
 
diff --git a/js/dist/carousel.js.map b/js/dist/carousel.js.map
index 22a68233f..0f7ef3ad3 100644
Binary files a/js/dist/carousel.js.map and b/js/dist/carousel.js.map differ
diff --git a/js/dist/popover.js b/js/dist/popover.js
index 3b81cae0d..90e909581 100644
--- a/js/dist/popover.js
+++ b/js/dist/popover.js
@@ -95,7 +95,7 @@ var Popover = function ($) {
       this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
       this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
 
-      $tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE);
+      $tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE);
 
       this.cleanupTether();
     };
diff --git a/js/dist/popover.js.map b/js/dist/popover.js.map
index e157059d9..124cfec22 100644
Binary files a/js/dist/popover.js.map and b/js/dist/popover.js.map differ
diff --git a/js/dist/tooltip.js b/js/dist/tooltip.js
index 418456120..1de06f445 100644
--- a/js/dist/tooltip.js
+++ b/js/dist/tooltip.js
@@ -330,7 +330,7 @@ var Tooltip = function ($) {
 
       this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
 
-      $tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE);
+      $tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE);
 
       this.cleanupTether();
     };
diff --git a/js/dist/tooltip.js.map b/js/dist/tooltip.js.map
index f1f64b87d..f2c815aed 100644
Binary files a/js/dist/tooltip.js.map and b/js/dist/tooltip.js.map differ
diff --git a/js/src/carousel.js b/js/src/carousel.js
index d85082ce5..e56d4f0f2 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -353,15 +353,10 @@ const Carousel = (($) => {
         $(activeElement)
           .one(Util.TRANSITION_END, () => {
             $(nextElement)
-              .removeClass(directionalClassName)
-              .removeClass(direction)
+              .removeClass(`${directionalClassName} ${direction}`)
+              .addClass(ClassName.ACTIVE)
 
-            $(nextElement).addClass(ClassName.ACTIVE)
-
-            $(activeElement)
-              .removeClass(ClassName.ACTIVE)
-              .removeClass(direction)
-              .removeClass(directionalClassName)
+            $(activeElement).removeClass(`${ClassName.ACTIVE} ${direction} ${directionalClassName}`)
 
             this._isSliding = false
 
diff --git a/js/src/popover.js b/js/src/popover.js
index 01804eda6..a08ed4de9 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -117,9 +117,7 @@ const Popover = (($) => {
       this.setElementContent($tip.find(Selector.TITLE), this.getTitle())
       this.setElementContent($tip.find(Selector.CONTENT), this._getContent())
 
-      $tip
-        .removeClass(ClassName.FADE)
-        .removeClass(ClassName.ACTIVE)
+      $tip.removeClass(`${ClassName.FADE} ${ClassName.ACTIVE}`)
 
       this.cleanupTether()
     }
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 94f77a2a4..dbc9cf18c 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -377,9 +377,7 @@ const Tooltip = (($) => {
 
       this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle())
 
-      $tip
-        .removeClass(ClassName.FADE)
-        .removeClass(ClassName.ACTIVE)
+      $tip.removeClass(`${ClassName.FADE} ${ClassName.ACTIVE}`)
 
       this.cleanupTether()
     }