got rid of ancient obsolete code