Remove unused command line args, fix comment