Changed defaults for expiry
Change max expiry timer interval  to 3 hours
Cleanup