even more clean after cleanup