Hiding 'Add to Homepage' and 'Add to NavBar

We are in the process of going with Fluid HCM 9.2 Image 22 PT 8.55.15 and we have commented out the following code to Hide the Add to HomePage and Add to NavBar in WEBLIB_PTNUI.PT_BUTTON_PIN.IScript.ShowPinMenu()

      rem &link_lp = GetHTMLText(HTML.PTNUI_PINTO_LINK_FLUIDHDR, &url_lp, MsgGetText(95, 10103, "Add To Homepage"), "addToHomepageId");

      rem &link_nb = GetHTMLText(HTML.PTNUI_PINTO_LINK_FLUIDHDR, &url_nb, MsgGetText(95, 10102, "Add To NavBar"), "addToNavbarId");

This work great for some classic pages but not all.

But Self Service Fluid pages it still comes up with the full menu. 

I checked a couple of Fluid Components and on Fluid tab Add To not checked.