Revert "No expiry date"

This reverts commit 123f55564bff7d847031e8ea9b9cf12c28e6f98f.
So that I can continue with tweaking in a much peaceful manner for personal use