Remove some horrible old code. Part 1.