MDL-55114 chat: Remove commented-out variables