Merge "Add missing clean steps."