Remove static modules's methods, add ModuleLinkExtractor