Removed more unneeded leftovers from optparse