classification cleanup

classification cleanup