Removing a lot of crufty code that isn't used anywhere.