Dead code removed, token-login activated