classification cleanup