EZP-22564: some cleanup