Removed references to old methods