Move scrollClipRect and scrollOverflowHidden to the retired section