Removes favoriting API which was overly complex. General cleanup.