Remove unnecessary catches