The following discussion from !171532 should be addressed: Tetiana Chupryna: > I think we also need to clean up all code related to the functionality that is outdated now with removed feature flag. I tried quickly remove System prompt but it might need more thoughts because it didn't work correctly. Could you please take a look? It could also be a follow-up Manoj M J > yes, I checked the removal of the existing prompt too, but it does not work because it is still being called. Specifically over [here](https://gitlab.com/gitlab-org/gitlab/-/blob/b4af0cde2844919c58ac45795d0cd6ef3af10a68/ee/lib/gitlab/llm/chain/concerns/ai_dependent.rb#L15), where it gets the rails prompts right in the beginning, even though, as the execution progresses, use_ai_gateway_agent_prompt? might turn out to be true. I think we need a revamp there if use_ai_gateway_agent_prompt? is true, we do not seek the output of provider_prompt_class.prompt(prompt_options). Would that be the right approach? Anyway, that would need a follow-up, so let's tackle it that way? Tetiana Chupryna > I agree that this is the right approach! Let's create a follow-up issue ## Summary We need to remove system prompt for tools that are moved to AI GW, however that will require to change the code in AiDependent module to prevent calling prompt on tools.