Remove UserData, was workaround for Heat bug