SVM cleanup