TYRUS-240: Clean up duplicated static fields (strings)