Try SmartDeblur [Paid software, trial version available]
You can remove Gaussian and Out-of-Focus blur with little tweaking. You can also have it analyze the image and create a custom deconvolution or draw one yourself, which is particularly useful for motion blur.
Drawbacks: It will have hiccups and may crash on small images, this means that it will be hard to use on cropped images. Futhermore, it works better on the photo before doing any other edits on it (in particular if you want to have it analyze it).
I suggest taking the trial version to see if it works for you, and from there decide if you want to purchase.