Removing singletons from Web Server internals