merge fsCurrentUser and fsUserCache
remove console logs
remove console logs
restore change checkpoint