Fixes in token handling, feature to remove domains