diff --git a/clutter/clutter/cally/cally-main.h b/clutter/clutter/cally/cally-main.h
deleted file mode 100644
index ce50513a0..000000000
--- a/clutter/clutter/cally/cally-main.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* CALLY - The Clutter Accessibility Implementation Library
- *
- * Copyright (C) 2008 Igalia, S.L.
- *
- * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
- *
- * Some parts are based on GailWidget from GAIL
- * GAIL - The GNOME Accessibility Implementation Library
- * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <cally/cally.h> can be included directly."
-#endif
-
-#include <glib.h>
-#include <atk/atk.h>
-
-G_BEGIN_DECLS
-
-CLUTTER_EXPORT
-gboolean cally_get_cally_initialized (void);
-CLUTTER_EXPORT
-gboolean cally_accessibility_init    (void);
-
-G_END_DECLS
diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
deleted file mode 100644
index 86315fc73..000000000
--- a/clutter/clutter/cally/cally.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* CALLY - The Clutter Accessibility Implementation Library
- *
- * Copyright (C) 2008 Igalia, S.L.
- *
- * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-#include "config.h"
-
-#include "cally/cally.h"
-
-#include "cally/cally-actor.h"
-#include "cally/cally-stage.h"
-#include "cally/cally-text.h"
-#include "cally/cally-clone.h"
-
-#include "cally/cally-util.h"
-
-#include "clutter/clutter.h"
-
-#include "clutter/clutter-debug.h"
-#include "clutter/clutter-private.h"
-
-/**
- * cally_accessibility_init:
- *
- * Initializes the accessibility support.
- *
- * Return value: %TRUE if accessibility support has been correctly
- * initialized.
- */
-gboolean
-cally_accessibility_init (void)
-{
-  /* Initialize the CallyUtility class */
-  _cally_util_override_atk_util ();
-
-  CLUTTER_NOTE (MISC, "Clutter Accessibility initialized");
-
-  return TRUE;
-}
-
-/**
- * cally_get_cally_initialized:
- *
- * Returns if the accessibility support using cally is enabled.
- *
- * Return value: %TRUE if accessibility support has been correctly
- * initialized.
- */
-gboolean cally_get_cally_initialized (void)
-{
-  return !g_strcmp0 (atk_get_toolkit_name (), "clutter");
-}
diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h
index 4b95b5c38..56e5fe25c 100644
--- a/clutter/clutter/cally/cally.h
+++ b/clutter/clutter/cally/cally.h
@@ -24,7 +24,6 @@
 
 #include "cally/cally-actor.h"
 #include "cally/cally-clone.h"
-#include "cally/cally-main.h"
 #include "cally/cally-root.h"
 #include "cally/cally-stage.h"
 #include "cally/cally-text.h"
diff --git a/clutter/clutter/clutter-context.c b/clutter/clutter/clutter-context.c
index 8c2c31729..513509eba 100644
--- a/clutter/clutter/clutter-context.c
+++ b/clutter/clutter/clutter-context.c
@@ -198,7 +198,10 @@ clutter_context_init_real (ClutterContext       *context,
 
   /* Initialize a11y */
   if (!(flags & CLUTTER_CONTEXT_FLAG_NO_A11Y))
-    cally_accessibility_init ();
+    {
+      _cally_util_override_atk_util ();
+      CLUTTER_NOTE (MISC, "Clutter Accessibility initialized");
+    }
 
   /* Initialize types required for paint nodes */
   clutter_paint_node_init_types (context->backend);
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index e6add3c5a..c64bf73a7 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -92,7 +92,7 @@ _clutter_context_get_show_fps (void)
 gboolean
 clutter_get_accessibility_enabled (void)
 {
-  return cally_get_cally_initialized ();
+  return !g_strcmp0 (atk_get_toolkit_name (), "clutter");
 }
 
 /**
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index b1d87c75a..721bb246b 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -217,7 +217,6 @@ cally_headers = [
     'cally/cally-actor.h',
     'cally/cally-clone.h',
     'cally/cally.h',
-    'cally/cally-main.h',
     'cally/cally-root.h',
     'cally/cally-stage.h',
     'cally/cally-text.h',
@@ -226,7 +225,6 @@ cally_headers = [
 
 cally_sources = [
     'cally/cally-actor.c',
-    'cally/cally.c',
     'cally/cally-clone.c',
     'cally/cally-root.c',
     'cally/cally-stage.c',