remove unused files and restore original extractor framework files to minimize diffs