Remove AWS key info
Merge branch 'dev' into mailbox