diff --git a/identity-web/src/routes/+layout.ts b/identity-web/src/routes/+layout.ts
index df9ab98..0e8dafc 100644
--- a/identity-web/src/routes/+layout.ts
+++ b/identity-web/src/routes/+layout.ts
@@ -4,6 +4,5 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-// FIXME: Update code to support SSR
 export const ssr = false;
 export const prerender = false;
diff --git a/identity-web/src/routes/auth/login/+page.svelte b/identity-web/src/routes/auth/login/+page.svelte
index 54548ec..1add283 100644
--- a/identity-web/src/routes/auth/login/+page.svelte
+++ b/identity-web/src/routes/auth/login/+page.svelte
@@ -9,7 +9,6 @@
 
 	let submitError: string | undefined;
 
-	// FIXME: This is a badly done hack
 	credentials.subscribe(
 		(v) => v != null && setTimeout(() => (window.location.pathname = '/dashboard'), 200)
 	);
@@ -34,7 +33,6 @@
 				submitError = 'Check your credentials and try again.';
 			} else {
 				credentials.set(response as Credentials);
-				// FIXME: This is a badly done hack
 				setTimeout(() => (window.location.pathname = '/dashboard'), 200);
 			}
 		},
diff --git a/identity-web/src/routes/auth/register/+page.svelte b/identity-web/src/routes/auth/register/+page.svelte
index d759f84..1d7121b 100644
--- a/identity-web/src/routes/auth/register/+page.svelte
+++ b/identity-web/src/routes/auth/register/+page.svelte
@@ -9,7 +9,6 @@
 
 	let submitError: string | undefined;
 
-	// FIXME: This is a badly done hack
 	credentials.subscribe(
 		(v) => v != null && setTimeout(() => (window.location.pathname = '/dashboard'), 200)
 	);
@@ -33,7 +32,6 @@
 				submitError = 'Check your credentials and try again, this user may already exist.';
 			} else {
 				credentials.set(response as Credentials);
-				// FIXME: This is a badly done hack
 				setTimeout(() => (window.location.pathname = '/dashboard'), 200);
 			}
 		},