Added clean flow