Remove some obsolete code yet again