UI classes cleanup