Dropped some obsolete code