abandom serverside map work, implement spy, sync with upstream