fids urls
refactor otp data gathering and calculation, remove repeated code from awsstore
refactor otp data gathering and calculation, remove repeated code from awsstore
remove unwanted code