Make Restart and Stop sync by default
Remove unused variable