Has anyone with the airsoft M17 or M18 removed the manual safety? If so, how did you do it?

In case anyone is following this, progress was made. I poppped the "FCU" out of the airsoft pistol and noticed that the manual safety appeared to be attached with a very small set screw. I was able to remove both set screws (allen wrench for one and drilling out the other). Once removed I used a screw driver to pry the safety levers off of both sides. I had to use a pair of vice grips to keep the pin from being pulled out while doing this.

This did remove the manual safety and the pistol functioned normally. However, the pin walks out slowly to the left side when you fire it. I've got to figure out how to solve that problem.

I don't own an M17/ M18, or even a P320, but I am considering getting into Airsoft, so I was following this thread on the possibility that I may need to do something similar on a future purchase.

Thanks for taking the time to follow up with an update on your mod.