Properly remove cluster in stop_cluster