Update: cleanup xPartSys