zpm: clean up for packaging integration