Simplified with server cleanup