diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte
index 80585507e..eca768d5a 100644
--- a/src/lib/layout/containerHeader.svelte
+++ b/src/lib/layout/containerHeader.svelte
@@ -11,7 +11,7 @@
     import { Alert, DropList, Heading } from '$lib/components';
     import { Pill } from '$lib/elements';
     import { organization } from '$lib/stores/organization';
-    import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
+    import { isCloud } from '$lib/system';
     import { createEventDispatcher, onMount } from 'svelte';
     import { wizard } from '$lib/stores/wizard';
     import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
@@ -61,9 +61,7 @@
     $: isLimited = limit !== 0 && limit < Infinity;
     $: overflowingServices = limitedServices.filter((service) => service.value >= 0);
     $: isButtonDisabled =
-        buttonDisabled ||
-        ($readOnly && !GRACE_PERIOD_OVERRIDE) ||
-        (isLimited && total >= limit && !hasUsageFees);
+        buttonDisabled || $readOnly || (isLimited && total >= limit && !hasUsageFees);
 
     onMount(() => {
         dispatch('data', { isButtonDisabled, limit, tier });
diff --git a/src/lib/system.ts b/src/lib/system.ts
index 5cb998dca..3586468ef 100644
--- a/src/lib/system.ts
+++ b/src/lib/system.ts
@@ -23,4 +23,3 @@ export const MODE = VARS.CONSOLE_MODE === Mode.CLOUD ? Mode.CLOUD : Mode.SELF_HO
 export const isCloud = MODE === Mode.CLOUD;
 export const isSelfHosted = MODE !== Mode.CLOUD;
 export const hasStripePublicKey = !!VARS.STRIPE_PUBLIC_KEY;
-export const GRACE_PERIOD_OVERRIDE = false;
diff --git a/src/routes/console/organization-[organization]/+page.svelte b/src/routes/console/organization-[organization]/+page.svelte
index 0cc3ff1af..bb3b1fd38 100644
--- a/src/routes/console/organization-[organization]/+page.svelte
+++ b/src/routes/console/organization-[organization]/+page.svelte
@@ -7,7 +7,7 @@
     import CreateProject from './createProject.svelte';
     import CreateOrganization from '../createOrganization.svelte';
     import { wizard } from '$lib/stores/wizard';
-    import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
+    import { isCloud } from '$lib/system';
     import { page } from '$app/stores';
     import { registerCommands } from '$lib/commandCenter';
     import {
@@ -90,7 +90,7 @@
                 showCreate = true;
             },
             keys: ['c'],
-            disabled: $readOnly && !GRACE_PERIOD_OVERRIDE,
+            disabled: $readOnly,
             group: 'projects',
             icon: 'plus'
         }
@@ -143,10 +143,7 @@
             <Heading tag="h2" size="5">Projects</Heading>
 
             <DropList bind:show={showDropdown} placement="bottom-end">
-                <Button
-                    on:click={handleCreateProject}
-                    event="create_project"
-                    disabled={$readOnly && !GRACE_PERIOD_OVERRIDE}>
+                <Button on:click={handleCreateProject} event="create_project" disabled={$readOnly}>
                     <span class="icon-plus" aria-hidden="true" />
                     <span class="text">Create project</span>
                 </Button>
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index 23c2d23d8..d93749cd1 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/console/organization-[organization]/header.svelte
@@ -18,16 +18,14 @@
         organizationList
     } from '$lib/stores/organization';
     import { wizard } from '$lib/stores/wizard';
-    import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
+    import { isCloud } from '$lib/system';
     import CreateOrganizationCloud from '../createOrganizationCloud.svelte';
 
     let areMembersLimited: boolean;
     $: organization.subscribe(() => {
         const limit = getServiceLimit('members') || Infinity;
         const isLimited = limit !== 0 && limit < Infinity;
-        areMembersLimited =
-            isCloud &&
-            (($readOnly && !GRACE_PERIOD_OVERRIDE) || (isLimited && $members?.total >= limit));
+        areMembersLimited = isCloud && ($readOnly || (isLimited && $members?.total >= limit));
     });
     let showDropdown = false;
 
diff --git a/src/routes/console/project-[project]/auth/+layout.svelte b/src/routes/console/project-[project]/auth/+layout.svelte
index cfb6a198b..7da5cc22e 100644
--- a/src/routes/console/project-[project]/auth/+layout.svelte
+++ b/src/routes/console/project-[project]/auth/+layout.svelte
@@ -3,7 +3,6 @@
     import { page } from '$app/stores';
     import { registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
     import { readOnly } from '$lib/stores/billing';
-    import { GRACE_PERIOD_OVERRIDE } from '$lib/system';
     import { project } from '../store';
     import { showCreateUser } from './+page.svelte';
     import { showCreateTeam } from './teams/+page.svelte';
@@ -21,7 +20,7 @@
             group: 'users',
             icon: 'plus',
             rank: $page.url.pathname.endsWith('auth') ? 10 : 0,
-            disabled: $readOnly && !GRACE_PERIOD_OVERRIDE
+            disabled: $readOnly
         },
         {
             label: 'Create team',
@@ -36,7 +35,7 @@
             group: 'teams',
             icon: 'plus',
             rank: $page.url.pathname.endsWith('teams') ? 10 : 0,
-            disabled: $readOnly && !GRACE_PERIOD_OVERRIDE
+            disabled: $readOnly
         },
         {
             label: 'Go to teams',
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
index 1462e407d..2be30c035 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
@@ -39,7 +39,7 @@
     import DeploymentSource from './deploymentSource.svelte';
     import DeploymentCreatedBy from './deploymentCreatedBy.svelte';
     import DeploymentDomains from './deploymentDomains.svelte';
-    import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
+    import { isCloud } from '$lib/system';
     import { readOnly } from '$lib/stores/billing';
 
     export let data;
@@ -152,7 +152,7 @@
                         <Button
                             secondary
                             on:click={() => ($execute = $func)}
-                            disabled={isCloud && $readOnly && !GRACE_PERIOD_OVERRIDE}>
+                            disabled={isCloud && $readOnly}>
                             Execute now
                         </Button>
                     </div>
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.svelte b/src/routes/console/project-[project]/settings/migrations/+page.svelte
index 2a7877a02..1375c9c17 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/+page.svelte
@@ -15,7 +15,7 @@
     import { isSameDay, toLocaleDate } from '$lib/helpers/date';
     import { Container } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
-    import { GRACE_PERIOD_OVERRIDE, isSelfHosted } from '$lib/system';
+    import { isSelfHosted } from '$lib/system';
     import { onMount } from 'svelte';
     import { project } from '../../store';
     import { openImportWizard } from './(import)';
@@ -227,7 +227,7 @@
                         class="u-margin-block-start-20"
                         secondary
                         on:click={openImportWizard}
-                        disabled={$readOnly && !GRACE_PERIOD_OVERRIDE}>
+                        disabled={$readOnly}>
                         Import data
                     </Button>
                 </div>
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
index e229e256c..001823e70 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
@@ -81,7 +81,6 @@
     import { bucket } from '../store';
     import UpdateMaxFileSize from './updateMaxFileSize.svelte';
     import { readOnly } from '$lib/stores/billing';
-    import { GRACE_PERIOD_OVERRIDE } from '$lib/system';
 
     let showDelete = false;
 
@@ -233,10 +232,7 @@
                 </svelte:fragment>
 
                 <svelte:fragment slot="actions">
-                    <Button
-                        disabled={enabled === $bucket.enabled ||
-                            ($readOnly && !GRACE_PERIOD_OVERRIDE)}
-                        submit>
+                    <Button disabled={enabled === $bucket.enabled || $readOnly} submit>
                         Update
                     </Button>
                 </svelte:fragment>
@@ -252,16 +248,14 @@
                             id="name"
                             label="Name"
                             placeholder="Enter name"
-                            readonly={$readOnly && !GRACE_PERIOD_OVERRIDE}
+                            readonly={$readOnly}
                             bind:value={bucketName} />
                     </FormList>
                 </svelte:fragment>
 
                 <svelte:fragment slot="actions">
                     <Button
-                        disabled={bucketName === $bucket.name ||
-                            !bucketName ||
-                            ($readOnly && !GRACE_PERIOD_OVERRIDE)}
+                        disabled={bucketName === $bucket.name || !bucketName || $readOnly}
                         submit>
                         Update
                     </Button>
@@ -314,8 +308,7 @@
                 </svelte:fragment>
                 <svelte:fragment slot="actions">
                     <Button
-                        disabled={bucketFileSecurity === $bucket.fileSecurity ||
-                            ($readOnly && !GRACE_PERIOD_OVERRIDE)}
+                        disabled={bucketFileSecurity === $bucket.fileSecurity || $readOnly}
                         submit>
                         Update
                     </Button>
@@ -429,9 +422,7 @@
                 </svelte:fragment>
 
                 <svelte:fragment slot="actions">
-                    <Button
-                        disabled={isExtensionsDisabled || ($readOnly && !GRACE_PERIOD_OVERRIDE)}
-                        submit>Update</Button>
+                    <Button disabled={isExtensionsDisabled || $readOnly} submit>Update</Button>
                 </svelte:fragment>
             </CardGrid>
         </Form>
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
index 3499e9c34..f031a0645 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
@@ -8,7 +8,7 @@
     import { getServiceLimit, readOnly, tierToPlan } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
     import { wizard } from '$lib/stores/wizard';
-    import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
+    import { isCloud } from '$lib/system';
     import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
     import { bucket } from '../store';
     import { updateBucket } from './+page.svelte';
@@ -66,7 +66,7 @@
                     fullWidth
                     id="size"
                     label="Size"
-                    disabled={$readOnly && !GRACE_PERIOD_OVERRIDE}
+                    disabled={$readOnly}
                     placeholder={$bucket.maximumFileSize.toString()}
                     min={0}
                     max={isCloud ? service : Infinity}
@@ -82,10 +82,7 @@
         </svelte:fragment>
 
         <svelte:fragment slot="actions">
-            <Button
-                disabled={$baseValue === $bucket.maximumFileSize ||
-                    ($readOnly && !GRACE_PERIOD_OVERRIDE)}
-                submit>
+            <Button disabled={$baseValue === $bucket.maximumFileSize || $readOnly} submit>
                 Update
             </Button>
         </svelte:fragment>