Clean up and fixed for recovery