Cleanup; fixed pixel format in recovery