Eliminate FB token collection, put on user obj