Mass cleanup: part 1