Remove debug code and old optparse.