Removed unused code for the expirationdate feature