Get rid of null entities