User.data change cleanups and changes