Feature/auth upgrades

Dead code?