Cleanups in frontend.c