cleanup according to new logger