diff --git a/admin_menu.install b/admin_menu.install
index 4809d84..5650dc5 100644
--- a/admin_menu.install
+++ b/admin_menu.install
@@ -6,15 +6,6 @@
  */
 
 /**
- * Implements hook_schema().
- */
-function admin_menu_schema() {
-  $schema['cache_admin_menu'] = drupal_get_schema_unprocessed('system', 'cache');
-  $schema['cache_admin_menu']['description'] = 'Cache table for Administration menu to store client-side caching hashes.';
-  return $schema;
-}
-
-/**
  * Implements hook_install().
  */
 function admin_menu_install() {
@@ -41,24 +32,3 @@ function admin_menu_uninstall() {
   variable_del('admin_menu_cache_server');
   variable_del('admin_menu_cache_client');
 }
-
-/**
- * Add {cache_admin_menu} table.
- */
-function admin_menu_update_7300() {
-  if (!db_table_exists('cache_admin_menu')) {
-    $schema = drupal_get_schema_unprocessed('system', 'cache');
-    db_create_table('cache_admin_menu', $schema);
-  }
-}
-
-/**
- * Remove local tasks from {menu_links} table.
- */
-function admin_menu_update_7303() {
-  db_delete('menu_router')
-    ->condition('path', 'admin/%', 'LIKE')
-    ->condition('type', MENU_IS_LOCAL_TASK, '&')
-    ->execute();
-}
-
diff --git a/admin_menu.services.yml b/admin_menu.services.yml
new file mode 100644
index 0000000..67cdbb6
--- /dev/null
+++ b/admin_menu.services.yml
@@ -0,0 +1,8 @@
+services:
+  cache.admin_menu:
+    class: Drupal\Core\Cache\CacheBackendInterface
+    tags:
+      - { name: cache.bin }
+    factory_method: get
+    factory_service: cache_factory
+    arguments: [admin_menu]
diff --git a/lib/Drupal/admin_menu/AdminMenuBundle.php b/lib/Drupal/admin_menu/AdminMenuBundle.php
deleted file mode 100644
index 2d83558..0000000
--- a/lib/Drupal/admin_menu/AdminMenuBundle.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\admin_menu\AdminMenuBundle.
- */
-
-namespace Drupal\admin_menu;
-
-use Drupal\Core\Cache\CacheFactory;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-/**
- * Admin menu dependency injection container.
- */
-class AdminMenuBundle extends Bundle {
-
-  /**
-   * Overrides Symfony\Component\HttpKernel\Bundle\Bundle::build().
-   */
-  public function build(ContainerBuilder $container) {
-    CacheFactory::registerBin($container, 'admin_menu');
-  }
-
-}