Clean-up of CLUtils