Fixed logging
Added check to see if init time is zero indicating graceful shutdown in expiry check
Reverted early fixes