I finally got the safety out tonite (stock bolt was being a bear to remove). I am sure there is a better way to remove the safety, but I had to strip down the entire trigger assembly to get it out. Oh well, it needs a good cleaning anyways.