diff --git a/assets/scss/_component-examples.scss b/assets/scss/_component-examples.scss
index f0a1bd8fd8..62c7ba720a 100644
--- a/assets/scss/_component-examples.scss
+++ b/assets/scss/_component-examples.scss
@@ -311,28 +311,6 @@
   margin-bottom: 1rem;
 }
 
-// Tooltips
-.bd-example-tooltips {
-  text-align: center;
-
-  > .btn {
-    margin-top: .25rem;
-    margin-bottom: .25rem;
-  }
-}
-.bs-tooltip-top-docs,
-.bs-tooltip-bottom-docs {
-  .arrow {
-    left: 50%;
-  }
-}
-.bs-tooltip-right-docs,
-.bs-tooltip-left-docs {
-  .arrow {
-    top: 50%;
-  }
-}
-
 // Popovers
 .bd-example-popover-static {
   padding-bottom: 1.5rem;
@@ -346,18 +324,6 @@
     margin: 1.25rem;
   }
 }
-.bs-popover-top-docs,
-.bs-popover-bottom-docs {
-  .arrow {
-    left: 50%;
-  }
-}
-.bs-popover-right-docs,
-.bs-popover-left-docs {
-  .arrow {
-    top: 50%;
-  }
-}
 
 // Tooltips
 .tooltip-demo a {
diff --git a/docs/4.0/components/popovers.md b/docs/4.0/components/popovers.md
index f500847089..a9d5d4ffe1 100644
--- a/docs/4.0/components/popovers.md
+++ b/docs/4.0/components/popovers.md
@@ -45,47 +45,7 @@ $(function () {
 })
 {% endhighlight %}
 
-## Static popover
-
-Four options are available: top, right, bottom, and left aligned.
-
-<div class="bd-example bd-example-popover-static">
-  <div class="popover bs-popover-top bs-popover-top-docs">
-    <div class="arrow"></div>
-    <h3 class="popover-header">Popover top</h3>
-    <div class="popover-body">
-      <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
-    </div>
-  </div>
-
-  <div class="popover bs-popover-right bs-popover-right-docs">
-    <div class="arrow"></div>
-    <h3 class="popover-header">Popover right</h3>
-    <div class="popover-body">
-      <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
-    </div>
-  </div>
-
-  <div class="popover bs-popover-bottom bs-popover-bottom-docs">
-    <div class="arrow"></div>
-    <h3 class="popover-header">Popover bottom</h3>
-    <div class="popover-body">
-      <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
-    </div>
-  </div>
-
-  <div class="popover bs-popover-left bs-popover-left-docs">
-    <div class="arrow"></div>
-    <h3 class="popover-header">Popover left</h3>
-    <div class="popover-body">
-      <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
-    </div>
-  </div>
-
-  <div class="clearfix"></div>
-</div>
-
-## Live demo
+## Example
 
 {% example html %}
 <button type="button" class="btn btn-lg btn-danger" data-toggle="popover" title="Popover title" data-content="And here's some amazing content. It's very engaging. Right?">Click to toggle popover</button>
@@ -93,6 +53,8 @@ Four options are available: top, right, bottom, and left aligned.
 
 ### Four directions
 
+Four options are available: top, right, bottom, and left aligned.
+
 <div class="bd-example popover-demo">
   <div class="bd-example-popovers">
     <button type="button" class="btn btn-secondary" data-container="body" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">