Did I remove it correctly? Merge when next update releases
Feel free to add something to the extra notes for this release