Fix #690: Cleanup launcher creation and class name tracking