Automatic merge from submit-queue Cleanup: replace some hardcoded vars and remove unused functions Replace some hardcoded vars and remove unused functions **Release note**: ```release-note NONE ```
Automatic merge from submit-queue Cleanup: replace some hardcoded vars and remove unused functions Replace some hardcoded vars and remove unused functions **Release note**: ```release-note NONE ```