make reloading work again
remove custom join function (use TextUtils.join instead)
remove old code