Merge "Optimizing: Clean up after HRor."