Merge "remove needless arguments to stopClatd"