diff --git a/admin_menu.install b/admin_menu.install
index d9eb140..d0284ff 100644
--- a/admin_menu.install
+++ b/admin_menu.install
@@ -19,19 +19,20 @@ function admin_menu_install() {
  */
 function admin_menu_uninstall() {
   // Delete variables.
-  variable_del('admin_menu_components');
-  variable_del('admin_menu_margin_top');
-  variable_del('admin_menu_position_fixed');
-  variable_del('admin_menu_tweak_modules');
-  variable_del('admin_menu_tweak_tabs');
-  variable_del('admin_menu_show_all');
-  variable_del('admin_menu_display');
-  variable_del('admin_menu_cache_server');
-  variable_del('admin_menu_cache_client');
+  // @TODO: D8 Update to configuration system: https://www.drupal.org/node/1667896
+  //variable_del('admin_menu_components');
+  //variable_del('admin_menu_margin_top');
+  //variable_del('admin_menu_position_fixed');
+  //variable_del('admin_menu_tweak_modules');
+  //variable_del('admin_menu_tweak_tabs');
+  //variable_del('admin_menu_show_all');
+  //variable_del('admin_menu_display');
+  //variable_del('admin_menu_cache_server');
+  //variable_del('admin_menu_cache_client');
   // Unused variables still should be deleted.
-  variable_del('admin_menu_devel_modules');
-  variable_del('admin_menu_devel_modules_enabled');
-  variable_del('admin_menu_devel_modules_skip');
+  //variable_del('admin_menu_devel_modules');
+  //variable_del('admin_menu_devel_modules_enabled');
+  //variable_del('admin_menu_devel_modules_skip');
 }
 
 /**
diff --git a/admin_menu.module b/admin_menu.module
index 02c98f6..761c007 100644
--- a/admin_menu.module
+++ b/admin_menu.module
@@ -146,11 +146,11 @@ function admin_menu_system_info_alter(&$info, $file, $type) {
  * Implements hook_page_bottom().
  */
 function admin_menu_page_bottom(array &$page_bottom) {
-  if (!user_access('access administration menu') || admin_menu_suppress(FALSE)) {
+  if (!\Drupal::currentUser()->hasPermission('access administration menu') || admin_menu_suppress(FALSE)) {
     return;
   }
   // Performance: Skip this entirely for AJAX requests.
-  $current_path = current_path();
+  $current_path = \Drupal::request()->getRequestUri();
   if (strpos($current_path, 'js/') === 0) {
     return;
   }
diff --git a/admin_menu.services.yml b/admin_menu.services.yml
index 67cdbb6..a1593d8 100644
--- a/admin_menu.services.yml
+++ b/admin_menu.services.yml
@@ -4,5 +4,5 @@ services:
     tags:
       - { name: cache.bin }
     factory_method: get
-    factory_service: cache_factory
+    factory: cache_factory:get
     arguments: [admin_menu]