diff --git a/.azure/gpu-tests-fabric.yml b/.azure/gpu-tests-fabric.yml
index 2554ab3d67cbf..da477107e8467 100644
--- a/.azure/gpu-tests-fabric.yml
+++ b/.azure/gpu-tests-fabric.yml
@@ -26,9 +26,7 @@ pr:
       - "tests/tests_fabric/run_standalone_*.sh"
       - "tests/tests_pytorch/run_standalone_tests.sh" # used by fabric through a symlink
       - "requirements/fabric/**"
-      - "src/lightning/__about__.py"
       - "src/lightning/__init__.py"
-      - "src/lightning/__main__.py"
       - "src/lightning/__setup__.py"
       - "src/lightning/__version__.py"
       - "src/lightning/fabric/**"
diff --git a/.azure/gpu-tests-pytorch.yml b/.azure/gpu-tests-pytorch.yml
index 95c760328e779..f154eb6632feb 100644
--- a/.azure/gpu-tests-pytorch.yml
+++ b/.azure/gpu-tests-pytorch.yml
@@ -25,9 +25,7 @@ pr:
       - "examples/pytorch/basics/backbone_image_classifier.py"
       - "examples/pytorch/basics/autoencoder.py"
       - "requirements/pytorch/**"
-      - "src/lightning/__about__.py"
       - "src/lightning/__init__.py"
-      - "src/lightning/__main__.py"
       - "src/lightning/__setup__.py"
       - "src/lightning/__version__.py"
       - "src/lightning/pytorch/**"
diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml
index 3e3af03272853..3940a1a7713c4 100644
--- a/.github/checkgroup.yml
+++ b/.github/checkgroup.yml
@@ -54,9 +54,7 @@ subprojects:
       - "examples/pytorch/basics/backbone_image_classifier.py"
       - "examples/pytorch/basics/autoencoder.py"
       - "requirements/pytorch/**"
-      - "src/lightning/__about__.py"
       - "src/lightning/__init__.py"
-      - "src/lightning/__main__.py"
       - "src/lightning/__setup__.py"
       - "src/lightning/__version__.py"
       - "src/lightning/pytorch/**"
@@ -166,6 +164,9 @@ subprojects:
       - "requirements/data/**"
       - "src/lightning/data/**"
       - "src/lightning_data/*"
+      - "src/lightning/__init__.py"
+      - "src/lightning/__setup__.py"
+      - "src/lightning/__version__.py"
       - "tests/tests_data/**"
       - "examples/data/**"
       - "pyproject.toml" # includes pytest config
@@ -227,9 +228,7 @@ subprojects:
       - "tests/tests_fabric/run_standalone_*.sh"
       - "tests/tests_pytorch/run_standalone_tests.sh" # used by Fabric through a symlink
       - "requirements/fabric/**"
-      - "src/lightning/__about__.py"
       - "src/lightning/__init__.py"
-      - "src/lightning/__main__.py"
       - "src/lightning/__setup__.py"
       - "src/lightning/__version__.py"
       - "src/lightning/fabric/**"
@@ -318,9 +317,7 @@ subprojects:
   - id: "lightning: Store"
     paths:
       - ".github/workflows/ci-tests-store.yml"
-      - "src/lightning/__about__.py"
       - "src/lightning/__init__.py"
-      - "src/lightning/__main__.py"
       - "src/lightning/__setup__.py"
       - "src/lightning/__version__.py"
       - "src/lightning/store/**"
diff --git a/.github/workflows/ci-tests-data.yml b/.github/workflows/ci-tests-data.yml
index d6ed6c50bfd14..fccb4394fa999 100644
--- a/.github/workflows/ci-tests-data.yml
+++ b/.github/workflows/ci-tests-data.yml
@@ -11,6 +11,9 @@ on:
       - ".actions/*"
       - "requirements/data/**"
       - "src/lightning/data/**"
+      - "src/lightning/__init__.py"
+      - "src/lightning/__setup__.py"
+      - "src/lightning/__version__.py"
       - "tests/tests_data/**"
       - "pyproject.toml" # includes pytest config
       - ".github/workflows/ci-tests-data.yml"
diff --git a/.github/workflows/ci-tests-store.yml b/.github/workflows/ci-tests-store.yml
index 2ce30ef88132b..c9bb6d8ebc7fc 100644
--- a/.github/workflows/ci-tests-store.yml
+++ b/.github/workflows/ci-tests-store.yml
@@ -10,9 +10,7 @@ on:
     paths:
       - ".actions/*"
       - "requirements/store/**"
-      - "src/lightning/__about__.py"
       - "src/lightning/__init__.py"
-      - "src/lightning/__main__.py"
       - "src/lightning/__setup__.py"
       - "src/lightning/__version__.py"
       - "src/lightning/store/**"
diff --git a/requirements/data/data.txt b/requirements/data/data.txt
index b45d01a58afe7..a69152bac81c6 100644
--- a/requirements/data/data.txt
+++ b/requirements/data/data.txt
@@ -4,3 +4,4 @@
 lightning-utilities >=0.8.0, <0.10.0
 # to be able to include also PL 2.0 and preserve `>` needed for CI min version bypass
 torch >0.14.0, <2.2.0
+lightning-cloud
diff --git a/src/lightning/__setup__.py b/src/lightning/__setup__.py
index 93b53dd25482c..f5d3cab96d86c 100644
--- a/src/lightning/__setup__.py
+++ b/src/lightning/__setup__.py
@@ -48,7 +48,6 @@ def _prepare_extras() -> Dict[str, Any]:
     extras["app-extra"] = extras["app-app"] + extras["app-cloud"] + extras["app-ui"] + extras["app-components"]
     extras["app-all"] = extras["app-extra"]
     extras["app-dev"] = extras["app-all"] + extras["app-test"]
-    extras["data-data"] += extras["app-app"]  # todo: consider cutting/leaning this dependency
     extras["data-all"] = extras["data-data"] + extras["data-cloud"] + extras["data-examples"]
     extras["data-dev"] = extras["data-all"] + extras["data-test"]
     extras["store-store"] = extras["app-app"]  # todo: consider cutting/leaning this dependency