Clean up rescue code