Execute the following: $ git grep -P "(message_count_unread_messages|get_contacts_with_unread_message_count|get_non_contacts_with_unread_message_count)" Confirm the only remaining references are the function stubs (that now throw exceptions), and references in upgrade.txt