Revert "merge extractor code from team's server"

This reverts commit cf3ca1be18580c5ff6c9ef74685f2b9430b3963f.