removed null where no null shall be