diff --git a/react-components/src/components/RevealToolbar/MeasurementButton.tsx b/react-components/src/components/RevealToolbar/MeasurementButton.tsx
deleted file mode 100644
index 652ef1cca96..00000000000
--- a/react-components/src/components/RevealToolbar/MeasurementButton.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
- * Copyright 2023 Cognite AS
- */
-
-import { type ReactElement, useState, useEffect, useCallback } from 'react';
-import { useReveal } from '../RevealCanvas/ViewerContext';
-import { Button, Tooltip as CogsTooltip } from '@cognite/cogs.js';
-import { type Measurement } from '@cognite/reveal/tools';
-import { FEET_TO_INCHES, METERS_TO_FEET } from '../../utilities/constants';
-import { useTranslation } from '../i18n/I18n';
-import {
-  useAddMeasurementsToUrl,
-  useInitializedMeasurementTool
-} from './hooks/measurementUrlStateHooks';
-
-export const distancesInFeetAndMeters = (distanceInMeters: number): string => {
-  const distanceInFeet = distanceInMeters * METERS_TO_FEET;
-  const distanceInFeetInt = Math.floor(distanceInFeet);
-  const distanceInches = Math.round(FEET_TO_INCHES * (distanceInFeet - distanceInFeetInt));
-  return `${distanceInMeters.toFixed(2)} m\n ${distanceInFeetInt}' ${distanceInches}''`;
-};
-
-export type MeasurementButtonProps = {
-  storeStateInUrl?: boolean;
-  onMeasurementsUpdate?: (measurements: Measurement[]) => void;
-};
-
-export const MeasurementButton = ({
-  storeStateInUrl = true,
-  onMeasurementsUpdate
-}: MeasurementButtonProps): ReactElement => {
-  const viewer = useReveal();
-  const { t } = useTranslation();
-  const [measurementEnabled, setMeasurementEnabled] = useState<boolean>(false);
-
-  const measurementTool = useInitializedMeasurementTool(storeStateInUrl);
-  const persistMeasurementsToUrl = useAddMeasurementsToUrl(storeStateInUrl);
-
-  const measurementAddedCallback = useCallback(() => {
-    const measurements = measurementTool.getAllMeasurements();
-    onMeasurementsUpdate?.(measurements);
-    persistMeasurementsToUrl(measurements);
-  }, [measurementTool, onMeasurementsUpdate, persistMeasurementsToUrl]);
-
-  const enterMeasurement = (): void => {
-    viewer.domElement.style.cursor = 'crosshair';
-    measurementTool.enterMeasurementMode();
-    measurementTool.visible(true);
-    measurementTool.on('added', measurementAddedCallback);
-  };
-
-  const exitMeasurement = (): void => {
-    viewer.domElement.style.cursor = 'default';
-    measurementTool.visible(false);
-    measurementTool.exitMeasurementMode();
-    measurementTool.off('added', measurementAddedCallback);
-  };
-
-  const toggleMeasurementEnabled = (): void => {
-    if (viewer.models.length <= 0) {
-      return;
-    }
-    setMeasurementEnabled((prevState) => !prevState);
-  };
-
-  useEffect(() => {
-    if (measurementEnabled) {
-      enterMeasurement();
-      return () => {
-        exitMeasurement();
-      };
-    }
-  }, [measurementEnabled]);
-
-  return (
-    <CogsTooltip
-      content={t('MEASUREMENTS_TOOLTIP', 'Distance measuring tool')}
-      placement="right"
-      appendTo={document.body}>
-      <Button
-        type="ghost"
-        icon="Ruler"
-        toggled={measurementEnabled}
-        aria-label="Make measurements"
-        onClick={toggleMeasurementEnabled}
-      />
-    </CogsTooltip>
-  );
-};
diff --git a/react-components/src/components/RevealToolbar/RevealToolbar.tsx b/react-components/src/components/RevealToolbar/RevealToolbar.tsx
index 4d4f1206607..82df5c655f3 100644
--- a/react-components/src/components/RevealToolbar/RevealToolbar.tsx
+++ b/react-components/src/components/RevealToolbar/RevealToolbar.tsx
@@ -9,7 +9,6 @@ import { LayersButton } from './LayersButton';
 import { SlicerButton } from './SlicerButton';
 import { SettingsButton } from './SettingsButton';
 import { withSuppressRevealEvents } from '../../higher-order-components/withSuppressRevealEvents';
-import { MeasurementButton } from './MeasurementButton';
 import { HelpButton } from './HelpButton';
 import { ShareButton } from './ShareButton';
 import { ResetCameraButton } from './ResetCameraButton';
@@ -51,8 +50,7 @@ const DefaultContentWrapper = (props: CustomToolbarContent): ReactElement => {
       <RuleBasedOutputsButton />
       <Divider weight="2px" length="75%" />
 
-      <SlicerButton storeStateInUrl={props.storeStateInUrl} />
-      <MeasurementButton />
+      <SlicerButton />
 
       <Divider weight="2px" length="75%" />
 
@@ -105,7 +103,6 @@ export const RevealToolbar = withSuppressRevealEvents(
   FitModelsButton: typeof FitModelsButton;
   SlicerButton: typeof SlicerButton;
   LayersButton: typeof LayersButton;
-  MeasurementButton: typeof MeasurementButton;
   ShareButton: typeof ShareButton;
   SettingsButton: typeof SettingsButton;
   HelpButton: typeof HelpButton;
@@ -120,7 +117,6 @@ export const RevealToolbar = withSuppressRevealEvents(
 RevealToolbar.FitModelsButton = FitModelsButton;
 RevealToolbar.SlicerButton = SlicerButton;
 RevealToolbar.LayersButton = LayersButton;
-RevealToolbar.MeasurementButton = MeasurementButton;
 RevealToolbar.ShareButton = ShareButton;
 RevealToolbar.SettingsButton = SettingsButton;
 RevealToolbar.HelpButton = HelpButton;
diff --git a/react-components/src/components/RevealToolbar/SlicerButton.tsx b/react-components/src/components/RevealToolbar/SlicerButton.tsx
index ffce1797c53..5f7176989c1 100644
--- a/react-components/src/components/RevealToolbar/SlicerButton.tsx
+++ b/react-components/src/components/RevealToolbar/SlicerButton.tsx
@@ -10,7 +10,6 @@ import { useReveal } from '../RevealCanvas/ViewerContext';
 import { Button, Dropdown, Menu, RangeSlider, Tooltip as CogsTooltip } from '@cognite/cogs.js';
 
 import styled from 'styled-components';
-import { useSlicerUrlParams } from './hooks/useUrlStateParam';
 import { useTranslation } from '../i18n/I18n';
 import { use3dModels } from '../../hooks/use3dModels';
 
@@ -21,18 +20,11 @@ type SliceState = {
   bottomRatio: number;
 };
 
-type SlicerButtonProps = {
-  storeStateInUrl?: boolean;
-};
-
-export const SlicerButton = ({ storeStateInUrl = true }: SlicerButtonProps): ReactElement => {
+export const SlicerButton = (): ReactElement => {
   const viewer = useReveal();
   const { t } = useTranslation();
   const models = use3dModels();
-  const [slicerUrlState, setSlicerUrlState] = useSlicerUrlParams();
-  const { bottom: initialBottomRatio, top: initialTopRatio } = storeStateInUrl
-    ? slicerUrlState
-    : { bottom: 0, top: 1 };
+  const { bottom: initialBottomRatio, top: initialTopRatio } = { bottom: 0, top: 1 };
   const [sliceActive, setSliceActive] = useState<boolean>(false);
 
   const [sliceState, setSliceState] = useState<SliceState>({
@@ -58,10 +50,6 @@ export const SlicerButton = ({ storeStateInUrl = true }: SlicerButtonProps): Rea
     if (maxHeight !== newMaxY || minHeight !== newMinY) {
       // Set clipping plane only if top or bottom has changed & storeStateInUrl is enabled
 
-      if (storeStateInUrl && (bottomRatio !== 0 || topRatio !== 1)) {
-        setGlobalPlanes(bottomRatio, topRatio, newMaxY, newMinY);
-      }
-
       setSliceState({
         maxHeight: newMaxY,
         minHeight: newMinY,
@@ -80,10 +68,6 @@ export const SlicerButton = ({ storeStateInUrl = true }: SlicerButtonProps): Rea
       bottomRatio: newValues[0],
       topRatio: newValues[1]
     });
-
-    if (storeStateInUrl) {
-      setSlicerUrlState(newValues);
-    }
   }
 
   function setGlobalPlanes(
diff --git a/react-components/src/components/RevealToolbar/hooks/measurementUrlStateHooks.ts b/react-components/src/components/RevealToolbar/hooks/measurementUrlStateHooks.ts
deleted file mode 100644
index 1dd8967d41b..00000000000
--- a/react-components/src/components/RevealToolbar/hooks/measurementUrlStateHooks.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
- * Copyright 2023 Cognite AS
- */
-
-import { useCallback, useMemo } from 'react';
-import { distancesInFeetAndMeters } from '../MeasurementButton';
-import { type Measurement, MeasurementTool } from '@cognite/reveal/tools';
-import { Vector3 } from 'three';
-import { useReveal } from '../../RevealCanvas/ViewerContext';
-
-type SerializedMeasurement = number[];
-
-const useGetMeasurementsFromUrlParam = (): (() => Array<{
-  startPoint: Vector3;
-  endPoint: Vector3;
-}>) => {
-  return useCallback(() => {
-    const url = new URL(window.location.toString());
-    const serializedMeasurements = url.searchParams.get('measurements');
-
-    if (serializedMeasurements === null) {
-      return [];
-    }
-
-    const measurements = JSON.parse(serializedMeasurements) as SerializedMeasurement[];
-
-    return measurements.map((measurementValues) => {
-      const startPoint = new Vector3().fromArray(measurementValues, 0);
-      const endPoint = new Vector3().fromArray(measurementValues, 3);
-
-      return { startPoint, endPoint };
-    });
-  }, []);
-};
-
-export const useInitializedMeasurementTool = (initializeFromUrl: boolean): MeasurementTool => {
-  const viewer = useReveal();
-  const getUrlMeasurements = useGetMeasurementsFromUrlParam();
-
-  return useMemo(() => {
-    const measurementTool = new MeasurementTool(viewer, {
-      distanceToLabelCallback: (distanceInMeters: number) => {
-        return distancesInFeetAndMeters(distanceInMeters);
-      }
-    });
-
-    if (initializeFromUrl) {
-      const measurements = getUrlMeasurements();
-      measurements.forEach((measurement) => {
-        measurementTool.addMeasurement(measurement.startPoint, measurement.endPoint);
-      });
-    }
-
-    measurementTool.visible(false);
-
-    return measurementTool;
-  }, [viewer]);
-};
-
-export const useAddMeasurementsToUrl = (
-  storeInUrl: boolean
-): ((measurements: Measurement[]) => void) => {
-  return useCallback((measurements: Measurement[]) => {
-    if (!storeInUrl) {
-      return;
-    }
-
-    const url = new URL(window.location.toString());
-
-    if (measurements.length > 0) {
-      const serializedMeasurements = measurements.map((measurement) => [
-        ...measurement.startPoint.toArray(),
-        ...measurement.endPoint.toArray()
-      ]);
-
-      const paramString = JSON.stringify(serializedMeasurements);
-      url.searchParams.set('measurements', paramString);
-    } else {
-      url.searchParams.delete('measurements');
-    }
-    window.history.pushState({}, '', url);
-  }, []);
-};
diff --git a/react-components/src/components/RevealToolbar/hooks/useUrlStateParam.tsx b/react-components/src/components/RevealToolbar/hooks/useUrlStateParam.tsx
deleted file mode 100644
index 9817373ad7c..00000000000
--- a/react-components/src/components/RevealToolbar/hooks/useUrlStateParam.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*!
- * Copyright 2023 Cognite AS
- */
-
-import { useCallback, useMemo } from 'react';
-
-type SearchParamsHookResult = {
-  url: URL;
-  searchParams: URLSearchParams;
-};
-
-const useSearchParams = (): SearchParamsHookResult => {
-  const url = new URL(window.location.toString());
-  const searchParams = useMemo(() => url.searchParams, [url]);
-  return { url, searchParams };
-};
-
-export enum ParamKeys {
-  SlicerState = 'slicerState',
-  CadLayersState = 'cadLayersState',
-  PointCloudLayersState = 'pointCloudLayersState',
-  Image360LayersState = 'image360LayersState'
-}
-
-export const useSlicerUrlParams = (): [
-  { top: number; bottom: number },
-  (slicerBottomTop: number[]) => void
-] => {
-  const { url, searchParams } = useSearchParams();
-
-  const slicerUrlState = useMemo(() => {
-    const bottomTop = searchParams.get(ParamKeys.SlicerState);
-
-    if (bottomTop !== null && bottomTop !== undefined) {
-      const [bottom, top] = JSON.parse(bottomTop);
-      return { bottom, top };
-    }
-
-    return { bottom: 0, top: 1 };
-  }, [searchParams]);
-
-  const setSlicerUrlState = useCallback(
-    (slicerBottomTop: number[]) => {
-      searchParams.set(ParamKeys.SlicerState, JSON.stringify(slicerBottomTop));
-      window.history.pushState({}, '', url);
-    },
-    [searchParams]
-  );
-
-  return [slicerUrlState, setSlicerUrlState];
-};
diff --git a/react-components/src/higher-order-components/withCameraStateUrlParam.tsx b/react-components/src/higher-order-components/withCameraStateUrlParam.tsx
index 6ae6e64fe12..36730c4761b 100644
--- a/react-components/src/higher-order-components/withCameraStateUrlParam.tsx
+++ b/react-components/src/higher-order-components/withCameraStateUrlParam.tsx
@@ -4,32 +4,31 @@
 
 import { useEffect, type ReactElement, type FunctionComponent } from 'react';
 import { useReveal } from '..';
-import { Vector3 } from 'three';
 import { type CameraState } from '@cognite/reveal';
 
-type CameraStateTransform = Omit<Required<CameraState>, 'rotation'>;
+export type CameraStateParameters = Omit<Required<CameraState>, 'rotation'>;
+export type CameraStateProps = {
+  cameraState: CameraStateParameters | undefined;
+  setCameraState: (value: CameraStateParameters | undefined) => void;
+};
 
-export function withCameraStateUrlParam<T extends object>(
+export function withCameraStateControl<T extends object>(
   Component: FunctionComponent<T>
-): FunctionComponent<T> {
-  return function CameraStateUrlParam(props: T): ReactElement {
+): FunctionComponent<T & CameraStateProps> {
+  return function CameraStateUrlParam(props: T & CameraStateProps): ReactElement {
     const reveal = useReveal();
-    const getCameraStateFromUrlParam = useGetCameraStateFromUrlParam();
+    const externalCameraState = props.cameraState;
 
     const setUrlParamOnCameraStop = (): void => {
-      const currentUrlCameraState = getCameraStateFromUrlParam();
       const currentCameraManagerState = reveal.cameraManager.getCameraState();
       if (
-        currentUrlCameraState !== undefined &&
-        !hasCameraStateChanged(currentUrlCameraState, currentCameraManagerState)
+        externalCameraState !== undefined &&
+        !hasCameraStateChanged(externalCameraState, currentCameraManagerState)
       ) {
         return;
       }
-      const { position, target } = currentCameraManagerState;
-      const url = new URL(window.location.toString());
-      url.searchParams.set('cameraPosition', `[${position.x},${position.y},${position.z}]`);
-      url.searchParams.set('cameraTarget', `[${target.x},${target.y},${target.z}]`);
-      window.history.replaceState({}, '', url);
+
+      props.setCameraState(currentCameraManagerState);
     };
 
     useEffect(() => {
@@ -43,8 +42,8 @@ export function withCameraStateUrlParam<T extends object>(
   };
 
   function hasCameraStateChanged(
-    previous: CameraStateTransform,
-    current: CameraStateTransform
+    previous: CameraStateParameters,
+    current: CameraStateParameters
   ): boolean {
     const epsilon = 0.001;
     const { position: previousPosition, target: previousTarget } = previous;
@@ -55,32 +54,3 @@ export function withCameraStateUrlParam<T extends object>(
     );
   }
 }
-
-export function useGetCameraStateFromUrlParam(): () => CameraStateTransform | undefined {
-  return () => {
-    const url = new URL(window.location.toString());
-    const position = url.searchParams.get('cameraPosition');
-    const target = url.searchParams.get('cameraTarget');
-
-    if (position === null || target === null) {
-      return;
-    }
-
-    const parsedPosition = getParsedVector(position);
-    const parsedTarget = getParsedVector(target);
-
-    if (parsedPosition === undefined || parsedTarget === undefined) {
-      return;
-    }
-
-    return { position: parsedPosition, target: parsedTarget };
-  };
-
-  function getParsedVector(s: string): Vector3 | undefined {
-    try {
-      return new Vector3().fromArray(JSON.parse(s) as [number, number, number]);
-    } catch (e) {
-      return undefined;
-    }
-  }
-}
diff --git a/react-components/src/index.ts b/react-components/src/index.ts
index 6783c349561..c9e847d8e2a 100644
--- a/react-components/src/index.ts
+++ b/react-components/src/index.ts
@@ -83,8 +83,9 @@ export { useModelsForInstanceQuery } from './query/useModelsForInstanceQuery';
 // Higher order components
 export { withSuppressRevealEvents } from './higher-order-components/withSuppressRevealEvents';
 export {
-  withCameraStateUrlParam,
-  useGetCameraStateFromUrlParam
+  withCameraStateControl,
+  type CameraStateParameters,
+  type CameraStateProps
 } from './higher-order-components/withCameraStateUrlParam';
 // Types
 export {
diff --git a/react-components/stories/Toolbar.stories.tsx b/react-components/stories/Toolbar.stories.tsx
index d6ac4542cdb..ac9e0938aa7 100644
--- a/react-components/stories/Toolbar.stories.tsx
+++ b/react-components/stories/Toolbar.stories.tsx
@@ -8,8 +8,6 @@ import {
   type QualitySettings,
   RevealToolbar,
   withSuppressRevealEvents,
-  withCameraStateUrlParam,
-  useGetCameraStateFromUrlParam,
   useCameraNavigation
 } from '../src';
 import { Color } from 'three';
@@ -20,6 +18,7 @@ import { signalStoryReadyForScreenshot } from './utilities/signalStoryReadyForSc
 import { RevealStoryContainer } from './utilities/RevealStoryContainer';
 import { getAddModelOptionsFromUrl } from './utilities/getAddModelOptionsFromUrl';
 import { SetOrbitOrFirstPersonControlsType } from '../src/components/RevealToolbar/SetFlexibleControlsType';
+import { useGetCameraStateFromUrlParam } from './utilities/useGetCameraStateFromUrlParam';
 
 const meta = {
   title: 'Example/Toolbar',
@@ -30,7 +29,7 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;
 
-const MyCustomToolbar = styled(withSuppressRevealEvents(withCameraStateUrlParam(ToolBar)))`
+const MyCustomToolbar = styled(withSuppressRevealEvents(ToolBar))`
   position: absolute;
   right: 20px;
   top: 70px;
diff --git a/react-components/stories/Topbar.stories.tsx b/react-components/stories/Topbar.stories.tsx
index 606ee311fc7..0f2158c6f77 100644
--- a/react-components/stories/Topbar.stories.tsx
+++ b/react-components/stories/Topbar.stories.tsx
@@ -3,17 +3,12 @@
  */
 
 import type { Meta, StoryObj } from '@storybook/react';
-import {
-  useGetCameraStateFromUrlParam,
-  useCameraNavigation,
-  RevealTopbar,
-  RevealCanvas,
-  Reveal3DResources
-} from '../src';
+import { useCameraNavigation, RevealTopbar, RevealCanvas, Reveal3DResources } from '../src';
 import { Color, Matrix4 } from 'three';
 import { type ReactElement, useEffect } from 'react';
 import { signalStoryReadyForScreenshot } from './utilities/signalStoryReadyForScreenshot';
 import { RevealStoryContext } from './utilities/RevealStoryContainer';
+import { useGetCameraStateFromUrlParam } from './utilities/useGetCameraStateFromUrlParam';
 
 const meta = {
   title: 'Example/Topbar',
diff --git a/react-components/stories/utilities/useGetCameraStateFromUrlParam.ts b/react-components/stories/utilities/useGetCameraStateFromUrlParam.ts
new file mode 100644
index 00000000000..979fd3324ad
--- /dev/null
+++ b/react-components/stories/utilities/useGetCameraStateFromUrlParam.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright 2024 Cognite AS
+ */
+import { Vector3 } from 'three';
+import { type CameraStateParameters } from '../../src';
+
+export function useGetCameraStateFromUrlParam(): () => CameraStateParameters | undefined {
+  return () => {
+    const url = new URL(window.location.toString());
+    const position = url.searchParams.get('cameraPosition');
+    const target = url.searchParams.get('cameraTarget');
+
+    if (position === null || target === null) {
+      return;
+    }
+
+    const parsedPosition = getParsedVector(position);
+    const parsedTarget = getParsedVector(target);
+
+    if (parsedPosition === undefined || parsedTarget === undefined) {
+      return;
+    }
+
+    return { position: parsedPosition, target: parsedTarget };
+  };
+
+  function getParsedVector(s: string): Vector3 | undefined {
+    try {
+      return new Vector3().fromArray(JSON.parse(s) as [number, number, number]);
+    } catch (e) {
+      return undefined;
+    }
+  }
+}
diff --git a/react-components/tests/visual-tests/__screenshots__/Toolbar.stories.spec.ts/cad-model-container-storybook-1.png b/react-components/tests/visual-tests/__screenshots__/Toolbar.stories.spec.ts/cad-model-container-storybook-1.png
index c11c13c8ddd..1d6f51445a4 100644
Binary files a/react-components/tests/visual-tests/__screenshots__/Toolbar.stories.spec.ts/cad-model-container-storybook-1.png and b/react-components/tests/visual-tests/__screenshots__/Toolbar.stories.spec.ts/cad-model-container-storybook-1.png differ