Update TTL to 1 week
Remove unused code