Cleanup / streamline recovery