Delete unused classes

This one is deleting all unused clases form dev branch