Some cleanup and todos.  Make sns example more clear by removing old dead test keys