Have you detailed stripped your Glock yet?
It's the most easiest thing to do!!! I just did it!
I was at a Glock Sport Shooting Foundation event and a Glock Armorer was there. He volunteered to clean my Glock and replaced the trigger with trigger bar and the recoil rod spring. I watched closely as he detailed stripped my G35 and cleaned every milk and cranny.
I asked him if the G35 trigger w/trigger bar would fit a G23, since I hated the serrated trigger on my compact. He said yes it would fit and gave me a free one.
When I got home, I grabbed my G23 and removed every part of the reciever to replace the stock trigger with a G35 trigger. It feels much better! And putting it back together was a snap!
Observation: Wiggle the slide stop lever first to loosen up the locking block pin and when removing the trigger with trigger bar from the trigger housing, pull it forward and rotate counter clockwise.
Glocks are awesome!