More refactoring of array and record removal