Removing unnecessary services
Removing more unnecessary classes