Adding clean phase, sort of