issue-24: removed Watcher and Mapper