Again removed unused code
Added Extractor class