removal of obsolete code