Add new clusterid variable, remove variables related to PSG unit