Great point, once you are on Paris, you should use the new out of the box functionality and remove this customization.