Pick pops

I'm working with a clean electric guitar solo right now that has some hefty pick clicks/pops in places. Oddly enough, this is the first time I have run into this and I think that is because it is the first time I have recorded a clean solo itb. Any ideas how to tone down the clicks and pops? It is a tight muted solo, so there is a lot of thumb action to the strings to get the whistles and what-not. It's a great solo, but the clicks are a little much. Ideas?