ZConfig code cleanup