Clean: part 2