Remove unused classes
Clean code