Updated and removed command line args that are not needed