more cleanup on timestamps - issue with short-lived credentials still present though