Removed old classification code path