Big cleanup part 1.