[ExtractorHandler] cleaning code