Remove unneeded exceptions