[Launcher] Clean up based on code review