Removal of obsolete code