diff --git a/_includes/JB/analytics b/_includes/JB/analytics
index 13c172de36..951a0e3d8d 100644
--- a/_includes/JB/analytics
+++ b/_includes/JB/analytics
@@ -1,6 +1,4 @@
-{% include JB/is_production %}
-
-{% if is_production and site.JB.analytics.provider and page.JB.analytics != false %}
+{% if site.safe and site.JB.analytics.provider and page.JB.analytics != false %}
 
 {% case site.JB.analytics.provider %}
 {% when "google" %}
diff --git a/_includes/JB/comments-providers/disqus b/_includes/JB/comments-providers/disqus
index 6343100301..618a7b737b 100644
--- a/_includes/JB/comments-providers/disqus
+++ b/_includes/JB/comments-providers/disqus
@@ -1,7 +1,6 @@
 <div id="disqus_thread"></div>
 <script type="text/javascript">
-    {% include JB/is_production %}
-    {% if is_production == false %}var disqus_developer = 1;{% endif %}
+    {% if site.safe == false %}var disqus_developer = 1;{% endif %}
     var disqus_shortname = '{{ site.JB.comments.disqus.short_name }}'; // required: replace example with your forum shortname
     {% if page.wordpress_id %}var disqus_identifier = '{{page.wordpress_id}} {{site.production_url}}/?p={{page.wordpress_id}}';{% endif %}
     /* * * DON'T EDIT BELOW THIS LINE * * */
diff --git a/_includes/JB/is_production b/_includes/JB/is_production
deleted file mode 100644
index 3548f8c3d0..0000000000
--- a/_includes/JB/is_production
+++ /dev/null
@@ -1,39 +0,0 @@
-{% capture jbcache %}{% comment %}
-
-  Determine whether or not the site is being built in a production environment.
-  
-  Parameters:
-    None.
-
-  Returns:
-    is_production: [true|false]
-    jb_prod_env: [development|github|other]
-
-  Examples:
-  
-    {% include JB/is_production %}
-    
-    {% if is_production != true %}
-      <h3>This is Private</h3>
-      <p>I love to watch television in my undies. Don't tell anyone!</p>
-    {% endif %}
-    
-    <h3>This is Public</h3>
-    <p>I have no unusual quirks.</p>
-
-{% endcomment %}
-
-{% assign is_production = false %}
-{% assign jb_prod_env = "development" %}
-
-{% if jekyll.environment != "development" %}
-  {% assign is_production = true %}
-  {% assign jb_prod_env = jekyll.environment %}
-{% endif %}
-
-{% if site.github %}
-  {% assign is_production = true %}
-  {% assign jb_prod_env = "github" %}
-{% endif %}
-
-{% endcapture %}{% assign jbcache = nil %}
\ No newline at end of file
diff --git a/_includes/JB/setup b/_includes/JB/setup
index 96a4a8d451..efcd84b002 100644
--- a/_includes/JB/setup
+++ b/_includes/JB/setup
@@ -2,11 +2,10 @@
   <!--
   - Dynamically set liquid variables for working with URLs/paths
   -->
-  {% include JB/is_production %}
   {% if site.JB.setup.provider == "custom" %}
     {% include custom/setup %}
   {% else %}
-    {% if is_production and site.JB.BASE_PATH and site.JB.BASE_PATH != '' %}
+    {% if site.safe and site.JB.BASE_PATH and site.JB.BASE_PATH != '' %}
       {% assign BASE_PATH = site.JB.BASE_PATH %}
       {% assign HOME_PATH = site.JB.BASE_PATH %}
     {% else %}
diff --git a/_includes/JB/sharing b/_includes/JB/sharing
index 175a001ae3..f5b11518bd 100644
--- a/_includes/JB/sharing
+++ b/_includes/JB/sharing
@@ -1,5 +1,4 @@
-{% include JB/is_production %}
-{% if is_production and site.JB.sharing.provider and page.JB.sharing != false %}
+{% if site.safe and site.JB.sharing.provider and page.JB.sharing != false %}
 
 {% case site.JB.sharing.provider %}
 {% when "custom" %}
diff --git a/index.md b/index.md
index c3e4ee1e7a..f8b54757a0 100644
--- a/index.md
+++ b/index.md
@@ -43,8 +43,4 @@ Here's a sample "posts list".
 This theme is still unfinished. If you'd like to be added as a contributor, [please fork](http://github.com/plusjade/jekyll-bootstrap)!
 We need to clean up the themes, make theme usage guides with theme-specific markup examples.
 
-{% include JB/is_production %}
-    
-## Production Mode?
 
-This site is {% if is_production != true %}not{% endif %} running in production mode. The environment is "{{jb_prod_env}}".
\ No newline at end of file