starting cleanup
Merge branch 'certificates' into testing