classes cleanup