Remove some obsolete code. (#441)