21966 - remove analysis, going to private-extensions