Remove some obsolete code.