make pset cleaner optional