doing some cleanup
Merge branch 'master' into secure-spa-api
fixing code removed by merge with master