Remove catch blocks for exceptions that are not thrown