clean various issues