Remove some exception handlers that were not fully specified