diff --git a/app/components/Cart.jsx b/app/components/Cart.jsx
index e421080..4214aa0 100644
--- a/app/components/Cart.jsx
+++ b/app/components/Cart.jsx
@@ -89,7 +89,6 @@ function CartLineItem({layout, line}) {
           to={lineItemUrl}
           onClick={() => {
             if (layout === 'aside') {
-              // close the drawer
               window.location.href = lineItemUrl;
             }
           }}
@@ -280,7 +279,6 @@ function CartDiscounts({discountCodes}) {
 
   return (
     <div>
-      {/* Have existing discount, display it with a remove option */}
       <dl hidden={!codes.length}>
         <div>
           <dt>Discount(s)</dt>
@@ -294,7 +292,6 @@ function CartDiscounts({discountCodes}) {
         </div>
       </dl>
 
-      {/* Show an input to apply a discount */}
       <UpdateDiscountForm discountCodes={codes}>
         <div>
           <input type="text" name="discountCode" placeholder="Discount code" />
diff --git a/app/components/Footer.jsx b/app/components/Footer.jsx
index 36bfc54..8067bcd 100644
--- a/app/components/Footer.jsx
+++ b/app/components/Footer.jsx
@@ -28,7 +28,6 @@ function FooterMenu({ menu, primaryDomainUrl }) {
     <nav className='footer-menu' role='navigation'>
       {(menu || FALLBACK_FOOTER_MENU).items.map((item) => {
         if (!item.url) return null
-        // if the url is internal, we strip the domain
         const url =
           item.url.includes('myshopify.com') ||
           item.url.includes(publicStoreDomain) ||
diff --git a/app/components/Header.jsx b/app/components/Header.jsx
index 1e41874..ae8cb5c 100644
--- a/app/components/Header.jsx
+++ b/app/components/Header.jsx
@@ -67,7 +67,6 @@ export function HeaderMenu({menu, primaryDomainUrl, viewport}) {
       ]).map((item) => {
         if (!item.url) return null;
 
-        // if the url is internal, we strip the domain
         const url =
           item.url.includes('myshopify.com') ||
           item.url.includes(publicStoreDomain) ||
diff --git a/app/components/Layout.jsx b/app/components/Layout.jsx
index d32e94c..f63bc74 100644
--- a/app/components/Layout.jsx
+++ b/app/components/Layout.jsx
@@ -51,14 +51,6 @@ export function Layout({
         isLoggedIn={isLoggedIn}
       />
       <main>{children}</main>
-      {/* TODO Fix Footer */}
-      {/* <Suspense>
-        <Await resolve={footer}>
-          {(footer) => (
-            <Footer menu={footer.menu} shop={header.shop} />
-          )}
-        </Await>
-      </Suspense> */}
     </>
   )
 }
diff --git a/app/components/Search.jsx b/app/components/Search.jsx
index c78d50d..d2edd0d 100644
--- a/app/components/Search.jsx
+++ b/app/components/Search.jsx
@@ -16,7 +16,6 @@ export const NO_PREDICTIVE_SEARCH_RESULTS = [
 export function SearchForm({searchTerm}) {
   const inputRef = useRef(null);
 
-  // focus the input when cmd+k is pressed
   useEffect(() => {
     function handleKeyDown(event) {
       if (event.key === 'k' && event.metaKey) {
@@ -212,8 +211,6 @@ export function PredictiveSearchForm({
     );
   }
 
-  // ensure the passed input has a type of search, because SearchResults
-  // will select the element based on the input
   useEffect(() => {
     inputRef?.current?.setAttribute('type', 'search');
   }, []);
@@ -244,7 +241,6 @@ export function PredictiveSearchResults() {
     if (!searchInputRef.current) return;
     searchInputRef.current.blur();
     searchInputRef.current.value = '';
-    // close the aside
     window.location.href = event.currentTarget.href;
   }
 
@@ -264,7 +260,6 @@ export function PredictiveSearchResults() {
           />
         ))}
       </div>
-      {/* view all results /search?q=term */}
       {searchTerm.current && (
         <Link onClick={goToSearchResult} to={`/search?q=${searchTerm.current}`}>
           <p>
@@ -371,7 +366,6 @@ function usePredictiveSearch() {
     totalResults: 0,
   };
 
-  // capture the search input element as a ref
   useEffect(() => {
     if (searchInputRef.current) return;
     searchInputRef.current = document.querySelector('input[type="search"]');
diff --git a/app/root.jsx b/app/root.jsx
index 56ecfa6..4d6db79 100644
--- a/app/root.jsx
+++ b/app/root.jsx
@@ -113,7 +113,6 @@ export async function loader({ context }) {
 
 export default function App() {
   const nonce = useNonce()
-  /** @type {LoaderReturnData} */
   const data = useLoaderData()
 
   return (
@@ -139,8 +138,6 @@ export default function App() {
           content='width=device-width,initial-scale=1'
         />
         <Meta />
-        {/* We need to either move the loading of CSS someplace else instead of links() */}
-        {/* or fix Links throwing an error when navigating to a 404 */}
         <Links />
       </head>
       <body>
@@ -178,9 +175,6 @@ export function ErrorBoundary() {
           content='width=device-width,initial-scale=1'
         />
         <Meta />
-        {/* Removed links, because it throws an exception when the actual route doesn't exist */}
-        {/* See https://github.com/concrete-utopia/utopia/issues/5218 }
-        {/* <Links /> */}
       </head>
       <body>
         <Layout {...rootData}>
diff --git a/app/routes/$.jsx b/app/routes/$.jsx
index 6830c78..4f3c0fb 100644
--- a/app/routes/$.jsx
+++ b/app/routes/$.jsx
@@ -1,6 +1,3 @@
-/**
- * @param {LoaderFunctionArgs}
- */
 export async function loader({request}) {
   throw new Response(`${new URL(request.url).pathname} not found`, {
     status: 404,
@@ -9,7 +6,4 @@ export async function loader({request}) {
 
 export default function CatchAllPage() {
   return null;
-}
-
-/** @typedef {import('@shopify/remix-oxygen').LoaderFunctionArgs} LoaderFunctionArgs */
-/** @typedef {import('@shopify/remix-oxygen').SerializeFrom<typeof loader>} LoaderReturnData */
+}
\ No newline at end of file
diff --git a/app/routes/_index.jsx b/app/routes/_index.jsx
index a20a11a..0c11db8 100644
--- a/app/routes/_index.jsx
+++ b/app/routes/_index.jsx
@@ -144,7 +144,6 @@ export default function LandingPage() {
                 zIndex: -1,
                 position: 'absolute',
                 top: 0,
-                // right: -80,
                 transform: 'scale(.75)',
               }}
               src='decorative/underline_01@2x.png'
@@ -198,7 +197,6 @@ export default function LandingPage() {
                 >
                   Amazing Pal for the Little Ones
                 </h2>
-                {/* TODO replace with remix link */}
                 <a
                   style={{
                     marginTop: '1em',
@@ -288,7 +286,6 @@ export default function LandingPage() {
                 >
                   Perfect for your lappy
                 </h2>
-                {/* TODO replace with remix link */}
                 <a
                   style={{
                     marginTop: '1em',
@@ -375,7 +372,6 @@ export default function LandingPage() {
                 >
                   Travel Companion
                 </h2>
-                {/* TODO replace with remix link */}
                 <a
                   style={{
                     marginTop: '1em',
diff --git a/app/routes/account.addresses.jsx b/app/routes/account.addresses.jsx
index c8c9030..e7daad3 100644
--- a/app/routes/account.addresses.jsx
+++ b/app/routes/account.addresses.jsx
@@ -309,7 +309,6 @@ function ExistingAddresses({addresses, defaultAddress}) {
  */
 export function AddressForm({address, defaultAddress, children}) {
   const {state, formMethod} = useNavigation();
-  /** @type {ActionReturnData} */
   const action = useActionData();
   const error = action?.error?.[address.id];
   const isDefaultAddress = defaultAddress?.id === address.id;
diff --git a/app/routes/account.jsx b/app/routes/account.jsx
index 01fdbb0..bedb493 100644
--- a/app/routes/account.jsx
+++ b/app/routes/account.jsx
@@ -78,7 +78,6 @@ export async function loader({request, context}) {
 }
 
 export default function Acccount() {
-  /** @type {LoaderReturnData} */
   const {customer, isPrivateRoute, isAccountHome} = useLoaderData();
 
   if (!isPrivateRoute && !isAccountHome) {
diff --git a/app/routes/account.orders.$id.jsx b/app/routes/account.orders.$id.jsx
index 5ee5a3a..ac4f9e5 100644
--- a/app/routes/account.orders.$id.jsx
+++ b/app/routes/account.orders.$id.jsx
@@ -55,7 +55,6 @@ export async function loader({params, context}) {
 }
 
 export default function OrderRoute() {
-  /** @type {LoaderReturnData} */
   const {order, lineItems, discountValue, discountPercentage} = useLoaderData();
   return (
     <div className="account-order">
@@ -74,7 +73,6 @@ export default function OrderRoute() {
           </thead>
           <tbody>
             {lineItems.map((lineItem, lineItemIndex) => (
-              // eslint-disable-next-line react/no-array-index-key
               <OrderLineRow key={lineItemIndex} lineItem={lineItem} />
             ))}
           </tbody>
diff --git a/app/routes/account.orders._index.jsx b/app/routes/account.orders._index.jsx
index 3d2200e..7629989 100644
--- a/app/routes/account.orders._index.jsx
+++ b/app/routes/account.orders._index.jsx
@@ -49,7 +49,6 @@ export async function loader({request, context}) {
 }
 
 export default function Orders() {
-  /** @type {LoaderReturnData} */
   const {customer} = useLoaderData();
   const {orders, numberOfOrders} = customer;
   return (
diff --git a/app/routes/account.profile.jsx b/app/routes/account.profile.jsx
index eead603..e067e50 100644
--- a/app/routes/account.profile.jsx
+++ b/app/routes/account.profile.jsx
@@ -106,7 +106,7 @@ export async function action({request, context}) {
 export default function AccountProfile() {
   const account = useOutletContext();
   const {state} = useNavigation();
-  /** @type {ActionReturnData} */
+
   const action = useActionData();
   const customer = action?.customer ?? account?.customer;
 
diff --git a/app/routes/account_.activate.$id.$activationToken.jsx b/app/routes/account_.activate.$id.$activationToken.jsx
index 3d3cc1c..85f5295 100644
--- a/app/routes/account_.activate.$id.$activationToken.jsx
+++ b/app/routes/account_.activate.$id.$activationToken.jsx
@@ -84,7 +84,6 @@ export async function action({request, context, params}) {
 }
 
 export default function Activate() {
-  /** @type {ActionReturnData} */
   const action = useActionData();
   const error = action?.error ?? null;
 
@@ -104,7 +103,6 @@ export default function Activate() {
             aria-label="Password"
             minLength={8}
             required
-            // eslint-disable-next-line jsx-a11y/no-autofocus
             autoFocus
           />
           <label htmlFor="passwordConfirm">Re-enter password</label>
diff --git a/app/routes/account_.login.jsx b/app/routes/account_.login.jsx
index b4d3993..9516914 100644
--- a/app/routes/account_.login.jsx
+++ b/app/routes/account_.login.jsx
@@ -68,7 +68,6 @@ export async function action({request, context}) {
 }
 
 export default function Login() {
-  /** @type {ActionReturnData} */
   const data = useActionData();
   const error = data?.error || null;
 
@@ -86,7 +85,6 @@ export default function Login() {
             required
             placeholder="Email address"
             aria-label="Email address"
-            // eslint-disable-next-line jsx-a11y/no-autofocus
             autoFocus
           />
           <label htmlFor="password">Password</label>
diff --git a/app/routes/account_.recover.jsx b/app/routes/account_.recover.jsx
index 3e0c2ec..5b026d3 100644
--- a/app/routes/account_.recover.jsx
+++ b/app/routes/account_.recover.jsx
@@ -44,7 +44,6 @@ export async function action({request, context}) {
 }
 
 export default function Recover() {
-  /** @type {ActionReturnData} */
   const action = useActionData();
 
   return (
@@ -75,7 +74,6 @@ export default function Recover() {
                 <input
                   aria-label="Email address"
                   autoComplete="email"
-                  // eslint-disable-next-line jsx-a11y/no-autofocus
                   autoFocus
                   id="email"
                   name="email"
diff --git a/app/routes/account_.register.jsx b/app/routes/account_.register.jsx
index 6f797b7..9d5666c 100644
--- a/app/routes/account_.register.jsx
+++ b/app/routes/account_.register.jsx
@@ -57,7 +57,6 @@ export async function action({request, context}) {
       throw new Error('Could not create customer');
     }
 
-    // get an access token for the new customer
     const {customerAccessTokenCreate} = await storefront.mutate(
       REGISTER_LOGIN_MUTATION,
       {
@@ -97,7 +96,6 @@ export async function action({request, context}) {
 }
 
 export default function Register() {
-  /** @type {ActionReturnData} */
   const data = useActionData();
   const error = data?.error || null;
   return (
@@ -114,7 +112,6 @@ export default function Register() {
             required
             placeholder="Email address"
             aria-label="Email address"
-            // eslint-disable-next-line jsx-a11y/no-autofocus
             autoFocus
           />
           <label htmlFor="password">Password</label>
diff --git a/app/routes/account_.reset.$id.$resetToken.jsx b/app/routes/account_.reset.$id.$resetToken.jsx
index bd1ba47..a70ea7d 100644
--- a/app/routes/account_.reset.$id.$resetToken.jsx
+++ b/app/routes/account_.reset.$id.$resetToken.jsx
@@ -63,7 +63,6 @@ export async function action({request, context, params}) {
 }
 
 export default function Reset() {
-  /** @type {ActionReturnData} */
   const action = useActionData();
 
   return (
@@ -76,7 +75,6 @@ export default function Reset() {
           <input
             aria-label="Password"
             autoComplete="current-password"
-            // eslint-disable-next-line jsx-a11y/no-autofocus
             autoFocus
             id="password"
             minLength={8}
diff --git a/app/routes/blogs.$blogHandle._index.jsx b/app/routes/blogs.$blogHandle._index.jsx
index 098d1f0..c1f0b30 100644
--- a/app/routes/blogs.$blogHandle._index.jsx
+++ b/app/routes/blogs.$blogHandle._index.jsx
@@ -37,7 +37,6 @@ export const loader = async ({request, params, context: {storefront}}) => {
 };
 
 export default function Blog() {
-  /** @type {LoaderReturnData} */
   const {blog} = useLoaderData();
   const {articles} = blog;
 
diff --git a/app/routes/blogs._index.jsx b/app/routes/blogs._index.jsx
index 64d9f48..df98b9f 100644
--- a/app/routes/blogs._index.jsx
+++ b/app/routes/blogs._index.jsx
@@ -27,7 +27,6 @@ export const loader = async ({request, context: {storefront}}) => {
 };
 
 export default function Blogs() {
-  /** @type {LoaderReturnData} */
   const {blogs} = useLoaderData();
 
   return (
diff --git a/app/routes/collections._index.jsx b/app/routes/collections._index.jsx
index c0d8c16..6aea584 100644
--- a/app/routes/collections._index.jsx
+++ b/app/routes/collections._index.jsx
@@ -18,7 +18,6 @@ export async function loader({context, request}) {
 }
 
 export default function Collections() {
-  /** @type {LoaderReturnData} */
   const {collections} = useLoaderData();
 
   return (
diff --git a/app/routes/policies.$handle.jsx b/app/routes/policies.$handle.jsx
index 0e326d7..8c9a053 100644
--- a/app/routes/policies.$handle.jsx
+++ b/app/routes/policies.$handle.jsx
@@ -41,7 +41,6 @@ export async function loader({params, context}) {
 }
 
 export default function Policy() {
-  /** @type {LoaderReturnData} */
   const {policy} = useLoaderData();
 
   return (
diff --git a/app/routes/products.$handle.jsx b/app/routes/products.$handle.jsx
index 803b88a..b20bc9d 100644
--- a/app/routes/products.$handle.jsx
+++ b/app/routes/products.$handle.jsx
@@ -116,7 +116,6 @@ function redirectToFirstVariant({ product, request }) {
 }
 
 export default function Product() {
-  /** @type {LoaderReturnData} */
   const { product, variants } = useLoaderData()
   const { selectedVariant } = product
   return (
diff --git a/utopia/components.utopia.js b/utopia/components.utopia.js
index e3ab293..df02f4a 100644
--- a/utopia/components.utopia.js
+++ b/utopia/components.utopia.js
@@ -111,9 +111,6 @@ const ColumnVariants = [
   },
 ]
 
-// SectionSubtitle,
-// SectionTitle,
-
 const Components = {
   '/app/routes/_index': {
     TestimonialCard: {
@@ -453,7 +450,7 @@ const Components = {
             variants: ColumnVariants,
           },
         ],
-      }, // row with placeholders, column with placeholders
+      },
       variants: SectionVariants,
     },
     Row: {
diff --git a/utopia/hydrogen.utopia.js b/utopia/hydrogen.utopia.js
index 7873012..0254900 100644
--- a/utopia/hydrogen.utopia.js
+++ b/utopia/hydrogen.utopia.js
@@ -30,7 +30,6 @@ const CurrencyCodeControl = Utopia.popupListControl([
     value: 'EUR',
     label: 'Euro (EUR).',
   },
-  // TODO: all currencies
 ])
 
 const UnitPriceMeasurementMeasuredUnit =