Removal of obsolete code.