Remove optparse dependency