diff --git a/Gemfile b/Gemfile
index 2d08a8a6f..fb6d18945 100755
--- a/Gemfile
+++ b/Gemfile
@@ -15,14 +15,11 @@ gem "rack-attack"
 gem "paperclip"
 gem "figaro"
 gem "fog-google", git: "https://github.com/fog/fog-google"
-gem "pg", "0.21.0" # TODO: Why can't I upgrade to 1.0.0?
+gem "pg"
 gem "polymorphic_constraints"
 gem "tzinfo" # For validation of user selected timezone names
 gem "foreman"
 gem "webpack-rails"
-# Error reporting tools.
-# Active on the "official" FarmBot server, set the appropriate ENV
-# vars if you wish to use them on your own servers.
 gem "rollbar"
 gem "skylight"
 gem "bunny"
@@ -40,9 +37,6 @@ group :development, :test do
   gem "faker"
   gem "smarf_doc", git: "https://github.com/RickCarlino/smarf_doc.git"
   gem "rails-erd"
-  # TODO: Upgrade versions when they fix this stuff:
-  # https://stackoverflow.com/questions/43983466
-  #   /controller-test-emits-debug-failure-messages-after-rails-5-1-upgrade
   gem "rspec"
   gem "rspec-rails"
   gem "simplecov"
diff --git a/Gemfile.lock b/Gemfile.lock
index 09693d0dc..0a2eca4ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,7 +165,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    loofah (2.2.0)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -183,7 +183,7 @@ GEM
     multipart-post (2.0.0)
     mutations (0.8.1)
       activesupport
-    nio4r (2.2.0)
+    nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
@@ -194,7 +194,7 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    pg (0.21.0)
+    pg (1.0.0)
     polymorphic_constraints (1.0.0)
       rails
     pry (0.11.3)
@@ -242,7 +242,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
+    rake (12.3.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -293,7 +293,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    skylight (1.5.1)
+    skylight (1.6.0)
       activesupport (>= 3.0.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -350,7 +350,7 @@ DEPENDENCIES
   letter_opener
   mutations
   paperclip
-  pg (= 0.21.0)
+  pg
   polymorphic_constraints
   pry
   pry-rails