Change back to patch with null values for removal of indexed children