d8 2.x - misc updates, cleanup
deleting maps