initial classification cleanup