Removed references to obsoleted code