Removed more unused code for the expiration date feature