Remove keys
Merge branch 'master' into UAT