Remove need for access keys. Refactoring.