Deleting old classes

Deleting unused classes, cleaning up atkvar