zsrc cleanup