Add command line arg for cluster urls
Remove unused comments