Remove references to obsolete command line args