Some cleanup of the launcher.