Cleanups on startup refactor