massive cleanup, part 2