OPT: Remove call to KNeighborsClassifier