Removing AWSCredentials stuff