Delete some obsolete code