EZP-22152: Cleanup