get rid of obsolete code