Moved Extractor Impl to a separate package
Removed unused method