Remove map stub
Merge branch 'refactoring'