further cleaning.removed another warning.rest CANNOT be removed!