Removed references to old functionality.