Remove unneccessary catch blocks