Cleanups in main