Converting PYTHIA8 to native cmake: cleanup