removed unnecessary nulls