Deleted unused classes
Will be finished later