z.h cleanups.