Missed a class check for the cleanup