more classify cleanup