Reverted all local map-extractor changes

rewrite of extrators will go to private repository