Remove some obsolete code