Can you please move the following three lines up, so that when removing the deprecated content there will be no trailing comma?