zcml cleanup