Remove dependency injection configuration from the classes