some issues cleanup