removed references to obsolete functionality that got removed from the core