Removed more optparse leftovers