remove extractContent and refactoring