got rid of obsolete code