Missed a few files.
Remove unused classes