Stop using userdata

Added fab functions to move userdata functionality to fab
this need to be removed