Removed all occurrencies of 'token' from JS, clean-up