temporal fix for map size, removed unnecessary msgs
Merge branch 'big-map'