Removed -l and -w command line switches