Remove service container dependency