remove ExtractContent and refactoring