add extractor
remove unused files