Kill ExtendedManager (and integrate it in the CookieManager)
fix whitespace