Removed UserData

TODO: Fix test cases.