Massive cleanup | part 1