diff --git a/api/src/auth_routes.ts b/api/src/auth_routes.ts
index c1ec31fc5..d26675b3f 100644
--- a/api/src/auth_routes.ts
+++ b/api/src/auth_routes.ts
@@ -47,12 +47,6 @@ const AVAILABLE_AUTH_PROVIDER_DISPLAY_INFO: {[name: string]: any} = {
   },
 };
 
-const HANDLER_OPTIONS: {[name: string]: any} = {
-  google: {
-    prompt: 'select_account',
-  },
-};
-
 passport.serializeUser((user: Express.User, done: DoneFunction) => {
   done(null, user.user_id);
 });
diff --git a/api/src/couchdb/notebooks.ts b/api/src/couchdb/notebooks.ts
index 98ce11132..9ce299f03 100644
--- a/api/src/couchdb/notebooks.ts
+++ b/api/src/couchdb/notebooks.ts
@@ -763,7 +763,6 @@ export const streamNotebookRecordsAsCSV = async (
   while (!done) {
     // record might be null if there was an invalid db entry
     if (record) {
-      
       const hrid = getRecordHRID(record);
       const row = [
         hrid,
diff --git a/api/src/index.ts b/api/src/index.ts
index 8db71e786..6ff2cf003 100644
--- a/api/src/index.ts
+++ b/api/src/index.ts
@@ -22,7 +22,11 @@
 import PouchDB from 'pouchdb';
 import PouchDBFind from 'pouchdb-find';
 
-import {CONDUCTOR_INTERNAL_PORT, CONDUCTOR_PUBLIC_URL, COUCHDB_INTERNAL_URL} from './buildconfig';
+import {
+  CONDUCTOR_INTERNAL_PORT,
+  CONDUCTOR_PUBLIC_URL,
+  COUCHDB_INTERNAL_URL,
+} from './buildconfig';
 
 import {app} from './routes';
 
diff --git a/app/src/App.tsx b/app/src/App.tsx
index 709576b00..3629aa7a1 100644
--- a/app/src/App.tsx
+++ b/app/src/App.tsx
@@ -43,7 +43,7 @@ import {AuthReturn} from './gui/components/authentication/auth_return';
 import CreateNewSurvey from './gui/components/workspace/CreateNewSurvey';
 import NotFound404 from './gui/pages/404';
 import {AppUrlListener} from './native_hooks';
-import { NotificationProvider } from './context/popup';
+import {NotificationProvider} from './context/popup';
 
 // type AppProps = {};
 
diff --git a/app/src/buildconfig.ts b/app/src/buildconfig.ts
index ea7498123..5896e02a0 100644
--- a/app/src/buildconfig.ts
+++ b/app/src/buildconfig.ts
@@ -56,28 +56,6 @@ function commit_version(): string {
   }
 }
 
-function prod_build(): boolean {
-  const productionBuild = import.meta.env.VITE_PRODUCTION_BUILD;
-  if (
-    productionBuild === '' ||
-    productionBuild === undefined ||
-    TRUTHY_STRINGS.includes(productionBuild.toLowerCase())
-  ) {
-    return true;
-  } else if (FALSEY_STRINGS.includes(productionBuild.toLowerCase())) {
-    return false;
-  } else {
-    logError('VITE_PRODUCTION_BUILD badly defined, assuming false');
-    return false;
-  }
-}
-/*
- * This isn't exported, instead to help reduce the number of environment
- * variables to set to get a production build for real users. Can be used in the
- * rest of the configuration.
- */
-const PROD_BUILD = prod_build();
-
 function include_pouchdb_debugging(): boolean {
   const debug_pouch = import.meta.env.VITE_DEBUG_POUCHDB;
   if (debug_pouch === '' || debug_pouch === undefined) {
@@ -215,32 +193,6 @@ function cluster_admin_group_name(): string {
   return name;
 }
 
-function disable_signin_redirect(): boolean {
-  const disable_signin = import.meta.env.VITE_DISABLE_SIGNIN_REDIRECT;
-  if (disable_signin === '' || disable_signin === undefined) {
-    return false;
-  }
-  if (FALSEY_STRINGS.includes(disable_signin.toLowerCase())) {
-    return false;
-  } else if (TRUTHY_STRINGS.includes(disable_signin.toLowerCase())) {
-    return true;
-  } else {
-    logError('VITE_DISABLE_SIGNIN_REDIRECT badly defined, assuming false');
-    return false;
-  }
-}
-
-function get_login_token(): string | undefined {
-  const login_token = import.meta.env.VITE_LOGIN_TOKEN;
-  if (login_token === '' || login_token === undefined) {
-    return undefined;
-  }
-  if (PROD_BUILD) {
-    logError('Production builds should not set login token, except under test');
-  }
-  return login_token;
-}
-
 // If VITE_BUGSNAG_KEY is not defined then we don't use Bugsnag
 function get_bugsnag_key(): string | false {
   const bugsnag_key = import.meta.env.VITE_BUGSNAG_KEY;
@@ -394,8 +346,6 @@ export const CLUSTER_ADMIN_GROUP_NAME = cluster_admin_group_name();
 export const SHOW_MINIFAUXTON = show_minifauxton();
 export const SHOW_WIPE = show_wipe();
 export const SHOW_NEW_NOTEBOOK = show_new_notebook();
-export const DISABLE_SIGNIN_REDIRECT = disable_signin_redirect();
-export const BUILT_LOGIN_TOKEN = get_login_token();
 export const BUGSNAG_KEY = get_bugsnag_key();
 export const NOTEBOOK_LIST_TYPE = get_notebook_list_type();
 export const NOTEBOOK_NAME = get_notebook_name();
diff --git a/app/src/constants/privateRouter.tsx b/app/src/constants/privateRouter.tsx
index 934b541d4..8a9fdd9a2 100644
--- a/app/src/constants/privateRouter.tsx
+++ b/app/src/constants/privateRouter.tsx
@@ -1,6 +1,5 @@
 import {Navigate} from 'react-router-dom';
 
-import {DISABLE_SIGNIN_REDIRECT} from '../buildconfig';
 import * as ROUTES from './routes';
 import {useGetAnyToken} from '../utils/tokenHooks';
 import LoadingApp from '../gui/components/loadingApp';
@@ -20,17 +19,11 @@ export const PrivateRoute = (props: PrivateRouteProps): React.ReactElement => {
   // Get a default token - this is the first listing's token
   // TODO use a context provider for listings instead of getting first entry
   const anyToken = useGetAnyToken();
-  console.log(`Found token ${anyToken.data ?? 'UNDEFINED/loading'}`);
-
   // The token is being retrieved
   if (anyToken.isFetching) {
     return <LoadingApp />;
   }
 
-  const {children} = props;
-  return !!anyToken.data?.token || DISABLE_SIGNIN_REDIRECT ? (
-    children
-  ) : (
-    <Navigate to={ROUTES.SIGN_IN} />
-  );
+  if (anyToken.data?.token) return props.children;
+  else return <Navigate to={ROUTES.SIGN_IN} />;
 };
diff --git a/app/src/context/functions.tsx b/app/src/context/functions.tsx
index d1d19bc12..77fdb08e5 100644
--- a/app/src/context/functions.tsx
+++ b/app/src/context/functions.tsx
@@ -61,7 +61,6 @@ export const getDefaultToken = async (): Promise<JWTTokenInfo | undefined> => {
 export const getAnyToken = async (): Promise<JWTTokenInfo | undefined> => {
   // Get listings
   const listings = await getListings();
-  console.log(listings);
 
   // If there is an entry, use first
   for (const listing of listings) {
diff --git a/app/src/gui/components/authentication/appbarAuth.tsx b/app/src/gui/components/authentication/appbarAuth.tsx
index 4c2565fd1..d73946a72 100644
--- a/app/src/gui/components/authentication/appbarAuth.tsx
+++ b/app/src/gui/components/authentication/appbarAuth.tsx
@@ -26,11 +26,9 @@ import {checkToken} from '../../../utils/helpers';
 import {Person} from '@mui/icons-material';
 import {theme} from '../../themes';
 
-interface SignInButtonComponentProps {}
-const SignInButtonComponent = (props: SignInButtonComponentProps) => {
+const SignInButtonComponent = () => {
   /**
     Component: SignInButtonComponent
-    
     */
   return (
     <Button
@@ -69,7 +67,6 @@ const AuthenticatedDisplayComponent = (
 ) => {
   /**
     Component: AuthenticatedDisplayComponent
-    
     */
 
   /**
diff --git a/app/src/gui/components/authentication/shortCodeOnly.tsx b/app/src/gui/components/authentication/shortCodeOnly.tsx
index e83dcd38e..751d7a973 100644
--- a/app/src/gui/components/authentication/shortCodeOnly.tsx
+++ b/app/src/gui/components/authentication/shortCodeOnly.tsx
@@ -88,7 +88,6 @@ interface ShortCodeOnlyComponentProps {
 export const ShortCodeOnlyComponent = (props: ShortCodeOnlyComponentProps) => {
   /**
     Component: ShortCodeOnlyComponent
-    
     */
 
   const [shortCode, setShortCode] = useState('');
diff --git a/app/src/gui/components/ui/tab-grid.tsx b/app/src/gui/components/ui/tab-grid.tsx
index 07501d333..ad03e7124 100644
--- a/app/src/gui/components/ui/tab-grid.tsx
+++ b/app/src/gui/components/ui/tab-grid.tsx
@@ -12,7 +12,7 @@ import {useNavigate} from 'react-router-dom';
 import * as ROUTES from '../../../constants/routes';
 import {useEffect, useState} from 'react';
 import {theme} from '../../themes';
-import { ACTIVATED_LABEL, NOT_ACTIVATED_LABEL } from '../workspace/notebooks';
+import {ACTIVATED_LABEL, NOT_ACTIVATED_LABEL} from '../workspace/notebooks';
 
 /**
  * Renders a tabbed grid component.
diff --git a/app/src/gui/components/workspace/notebooks.tsx b/app/src/gui/components/workspace/notebooks.tsx
index adad27f5a..36a550630 100644
--- a/app/src/gui/components/workspace/notebooks.tsx
+++ b/app/src/gui/components/workspace/notebooks.tsx
@@ -26,7 +26,7 @@ import {grey} from '@mui/material/colors';
 import {useTheme} from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import {GridColDef} from '@mui/x-data-grid';
-import {useContext, useEffect, useState} from 'react';
+import {useContext, useState} from 'react';
 import {useNavigate} from 'react-router-dom';
 import {
   NOTEBOOK_LIST_TYPE,
diff --git a/app/src/gui/pages/notebook_list.tsx b/app/src/gui/pages/notebook_list.tsx
deleted file mode 100644
index 4fbff4bbd..000000000
--- a/app/src/gui/pages/notebook_list.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2021, 2022 Macquarie University
- *
- * Licensed under the Apache License Version 2.0 (the, "License");
- * you may not use, this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing software
- * distributed under the License is distributed on an "AS IS" BASIS
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied.
- * See, the License, for the specific language governing permissions and
- * limitations under the License.
- *
- * Filename: notebook_list.tsx
- * Description:
- *   TODO
- */
-import {Box} from '@mui/material';
-
-import Breadcrumbs from '../components/ui/breadcrumbs';
-import NoteBooks from '../components/workspace/notebooks';
-import {NOTEBOOK_NAME_CAPITALIZED} from '../../buildconfig';
-// import {TokenContents} from '@faims3/data-model';
-// type NoteBookListProps = {
-//   token?: null | undefined | TokenContents;
-// };
-
-export default function NoteBookList() {
-  const breadcrumbs = [
-    // {link: ROUTES.INDEX, title: 'Home'},
-    {title: `${NOTEBOOK_NAME_CAPITALIZED}s`},
-  ];
-
-  return (
-    <Box>
-      <Breadcrumbs data={breadcrumbs} />
-      <NoteBooks />
-    </Box>
-  );
-}
diff --git a/app/src/gui/pages/signin.tsx b/app/src/gui/pages/signin.tsx
index 924317359..0edb1adfe 100644
--- a/app/src/gui/pages/signin.tsx
+++ b/app/src/gui/pages/signin.tsx
@@ -31,9 +31,7 @@ import Breadcrumbs from '../components/ui/breadcrumbs';
 import {QRCodeRegistration, ShortCodeRegistration} from './shortcode';
 import OnboardingComponent from '../components/authentication/oneServerLanding';
 import {Capacitor} from '@capacitor/core';
-import {useGetDefaultToken} from '../../utils/tokenHooks';
-import {getAnyToken, getDefaultToken} from '../../context/functions';
-import {useQuery} from '@tanstack/react-query';
+import {useGetAnyToken} from '../../utils/tokenHooks';
 
 export function SignIn() {
   const [listings, setListings] = useState<ListingsObject[] | null>(null);
@@ -41,12 +39,8 @@ export function SignIn() {
   const platform = Capacitor.getPlatform();
   const allowQr = platform === 'ios' || platform === 'android';
 
-  // This will always fetch the token on first load of component
-  const tokenQuery = useQuery({
-    queryKey: ['forceful token fetch'],
-    queryFn: getAnyToken,
-    refetchOnMount: true,
-  });
+  // Get the current login token if any
+  const tokenQuery = useGetAnyToken();
 
   useEffect(() => {
     getSyncableListingsInfo().then(setListings).catch(logError);
diff --git a/app/src/gui/themes/themes.d.ts b/app/src/gui/themes/themes.d.ts
index 8f1c53e1b..98674777d 100644
--- a/app/src/gui/themes/themes.d.ts
+++ b/app/src/gui/themes/themes.d.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import {PaletteOptions, TypeBackground} from '@mui/material/styles';
 
 declare module '@mui/material/styles' {
diff --git a/app/src/utils/tokenHooks.tsx b/app/src/utils/tokenHooks.tsx
index da3ec3f8b..c8f4d21fe 100644
--- a/app/src/utils/tokenHooks.tsx
+++ b/app/src/utils/tokenHooks.tsx
@@ -63,11 +63,22 @@ export const useGetAnyToken = () => {
   const query = useQuery({
     // The query function that fetches the token
     queryFn: async () => {
-      return await getAnyToken();
+      const result = await getAnyToken();
+      // can't return undefined or useQuery thinks it's an error
+      if (result === undefined) {
+        // this looks enough like TokenContents to fool the callers
+        return {token: undefined, parsedToken: undefined};
+      } else {
+        return result;
+      }
     },
-    // The query key, which includes the listing ID to ensure proper caching
+    // we don't want this to be cached since then logout would break
     queryKey: ['get any token'],
+    refetchOnWindowFocus: true,
     refetchOnMount: true,
+    gcTime: 0, // don't cache it
+    staleTime: 0, // no really, please don't
+    enabled: true, // always refetch
   });
 
   // Return an object with the token and query state