Remove unused classes

Already have them in the libs