Remove DI injection annotations and use in services.yml