Removed unused server components