That means we would need to remove all of *Server and *Main. If you guys are OK with that I can work on that now, but it seems orthogonal.