deleted unnecessary classes

Issues: #25