fix P6DriverCore arguments cleanup in the optional module as well