Remove bundled copy of popt