Remove some more temporary code.