Cleanup interfaces & sessionId handling